FS#10274 : Move timer code in target tree

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

FS#10274 - Move timer code in target tree

Attached to Project: Rockbox
Opened by Rafaël Carré (funman) - Thursday, 04 June 2009, 02:30 GMT+2
Last edited by Rafaël Carré (funman) - Monday, 29 June 2009, 16:29 GMT+2

Task Type	Patches
Category	Drivers
Status	Closed
Assigned To	Jens Arnold (amiconn)
Player Type	All players
Severity	Low
Priority	Normal
Reported Version	Version 3.2
Due in Version	Undecided
Due Date	Undecided
Percent Complete
Private	No

Details

I have splitted the diff in small patches for easier review/syncing.

- Move target specific code from timer.c into target tree, creating new timer-X.c files ; copyrighted by whoever wrote the code in timer.c

- TIMER_REGISTER / TIMER_UNREGISTER / TIMER_SET macros are removed, and timer_s{top,tart,et} declared in timer.h. The functions themselves are target-specific (in target/*/timer-*.c)

- Remove int_prio argument from timer_register(), and move the only use for it into the SH7034 specific alpine_cdc plugin

- Put TIMER_FREQ definition in CPU-specific headers, and completely remove timer-target.h since it was its only content.

TODO : bump plugin API when it's committed

0001-Move-Sansa-AMS-timer-code-in-the-target-tree... (7.8 KiB)

 b/firmware/target/arm/as3525/timer-as3525.c |  163 ++++++++++++++++++++++++++++
 b/firmware/timer.c                          |   35 ------
 2 files changed, 163 insertions(+), 35 deletions(-)

0002-Rename-TIMER_REGISTER-macro-to-TIMER_START-a... (14.8 KiB)

 b/firmware/target/arm/as3525/timer-as3525.c                   |    4 +--
 b/firmware/target/arm/as3525/timer-target.h                   |   13 ++++------
 b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c |    4 +--
 b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h      |   13 ++++------
 b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c          |    4 +--
 b/firmware/target/arm/imx31/gigabeat-s/timer-target.h         |   13 ++++------
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c      |    4 +--
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h      |   13 ++++------
 b/firmware/target/arm/tcc77x/timer-target.h                   |   13 ++++------
 b/firmware/target/arm/tcc77x/timer-tcc77x.c                   |    4 +--
 b/firmware/target/arm/tcc780x/timer-target.h                  |   13 ++++------
 b/firmware/target/arm/tcc780x/timer-tcc780x.c                 |    4 +--
 b/firmware/target/arm/tms320dm320/timer-dm320.c               |    4 +--
 b/firmware/target/arm/tms320dm320/timer-target.h              |   13 ++++------
 b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c          |    4 +--
 b/firmware/target/mips/ingenic_jz47xx/timer-target.h          |   13 ++++------
 b/firmware/timer.c                                            |   10 +++----
 17 files changed, 68 insertions(+), 78 deletions(-)

0003-Move-PNX0101-timer-code-in-the-target-tree.p... (8.4 KiB)

 b/firmware/SOURCES                            |    1 
 b/firmware/export/timer.h                     |    4 -
 b/firmware/target/arm/pnx0101/timer-pnx0101.c |   82 ++++++++++++++++++++++++++
 b/firmware/target/arm/pnx0101/timer-target.h  |   39 ++++++++++++
 b/firmware/timer.c                            |   51 ----------------
 5 files changed, 125 insertions(+), 52 deletions(-)

0004-Move-coldfire-timer-code-in-the-target-tree.... (11.2 KiB)

 b/firmware/SOURCES                          |    1 
 b/firmware/export/timer.h                   |    6 -
 b/firmware/target/coldfire/timer-coldfire.c |  119 ++++++++++++++++++++++++++++
 b/firmware/target/coldfire/timer-target.h   |   40 +++++++++
 b/firmware/timer.c                          |   83 -------------------
 5 files changed, 164 insertions(+), 85 deletions(-)

0005-Move-SH7034-timer-code-in-the-target-tree.pa... (14.2 KiB)

 b/firmware/SOURCES                                       |    3 
 b/firmware/export/timer.h                                |    6 -
 b/firmware/target/arm/as3525/timer-target.h              |    2 
 b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h |    2 
 b/firmware/target/arm/imx31/gigabeat-s/timer-target.h    |    2 
 b/firmware/target/arm/pnx0101/timer-target.h             |    2 
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h |    2 
 b/firmware/target/arm/tcc780x/timer-target.h             |    2 
 b/firmware/target/arm/tms320dm320/timer-target.h         |    2 
 b/firmware/target/coldfire/timer-target.h                |    2 
 b/firmware/target/mips/ingenic_jz47xx/timer-target.h     |    2 
 b/firmware/target/sh/archos/timer-archos.c               |   85 +++++++++++++++
 b/firmware/target/sh/archos/timer-target.h               |   41 +++++++
 b/firmware/timer.c                                       |   61 ----------
 14 files changed, 147 insertions(+), 67 deletions(-)

0006-Move-PP-last-target-timer-code-in-target-tre... (9.5 KiB)

 b/firmware/SOURCES                   |    1 
 b/firmware/export/timer.h            |   10 ++--
 b/firmware/target/arm/timer-pp.c     |   87 +++++++++++++++++++++++++++++++++++
 b/firmware/target/arm/timer-target.h |   52 ++++++++++++++++++++
 b/firmware/timer.c                   |   71 +++-------------------------
 5 files changed, 154 insertions(+), 67 deletions(-)

0007-Remove-int_prio-argument-from-timer_register... (17.7 KiB)

 b/apps/plugin.h                                          |    4 -
 b/apps/plugins/alpine_cdc.c                              |    6 +-
 b/apps/plugins/doom/i_system.c                           |    2 
 b/apps/plugins/lib/grey_core.c                           |    5 --
 b/apps/plugins/metronome.c                               |    2 
 b/apps/plugins/test_scanrate.c                           |    2 
 b/apps/plugins/video.c                                   |    8 +--
 b/docs/PLUGIN_API.new                                    |    3 -
 b/firmware/backlight.c                                   |    2 
 b/firmware/export/timer.h                                |    2 
 b/firmware/profile.c                                     |    4 -
 b/firmware/target/arm/as3525/timer-target.h              |    2 
 b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h |    2 
 b/firmware/target/arm/imx31/gigabeat-s/timer-target.h    |    2 
 b/firmware/target/arm/pnx0101/timer-target.h             |    2 
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h |    2 
 b/firmware/target/arm/tcc780x/timer-target.h             |    2 
 b/firmware/target/arm/timer-target.h                     |    4 -
 b/firmware/target/arm/tms320dm320/timer-target.h         |    2 
 b/firmware/target/coldfire/timer-target.h                |    2 
 b/firmware/target/mips/ingenic_jz47xx/timer-target.h     |    2 
 b/firmware/target/sh/archos/timer-archos.c               |    4 -
 b/firmware/target/sh/archos/timer-target.h               |    6 +-
 b/firmware/timer.c                                       |   31 +--------------
 b/uisimulator/sdl/timer.c                                |    3 -
 25 files changed, 40 insertions(+), 66 deletions(-)

0008-Remove-the-TIMER_-macros-and-declare-target-... (21.7 KiB)

 b/firmware/export/timer.h                                     |    6 +++
 b/firmware/target/arm/as3525/timer-as3525.c                   |    6 +--
 b/firmware/target/arm/as3525/timer-target.h                   |   13 -------
 b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c |    6 +--
 b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h      |   13 -------
 b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c          |    6 +--
 b/firmware/target/arm/imx31/gigabeat-s/timer-target.h         |   13 -------
 b/firmware/target/arm/pnx0101/timer-pnx0101.c                 |    6 +--
 b/firmware/target/arm/pnx0101/timer-target.h                  |   13 -------
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c      |    6 +--
 b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h      |   13 -------
 b/firmware/target/arm/tcc77x/timer-target.h                   |   13 -------
 b/firmware/target/arm/tcc77x/timer-tcc77x.c                   |    6 +--
 b/firmware/target/arm/tcc780x/timer-target.h                  |   13 -------
 b/firmware/target/arm/tcc780x/timer-tcc780x.c                 |    6 +--
 b/firmware/target/arm/timer-pp.c                              |    6 +--
 b/firmware/target/arm/timer-target.h                          |   18 ----------
 b/firmware/target/arm/tms320dm320/timer-dm320.c               |    6 +--
 b/firmware/target/arm/tms320dm320/timer-target.h              |   13 -------
 b/firmware/target/coldfire/timer-coldfire.c                   |    6 +--
 b/firmware/target/coldfire/timer-target.h                     |   13 -------
 b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c          |    6 +--
 b/firmware/target/mips/ingenic_jz47xx/timer-target.h          |   13 -------
 b/firmware/target/sh/archos/timer-archos.c                    |    6 +--
 b/firmware/target/sh/archos/timer-target.h                    |   13 -------
 b/firmware/timer.c                                            |   13 +------
 26 files changed, 44 insertions(+), 208 deletions(-)

0009-Put-TIMER_FREQ-definition-in-CPU-specific-co... (27.4 KiB)

 b/firmware/export/as3525.h                                 |    3 +
 b/firmware/export/at91sam9260.h                            |    4 +
 b/firmware/export/dm320.h                                  |    4 +
 b/firmware/export/imx31l.h                                 |    4 +
 b/firmware/export/jz4740.h                                 |    3 +
 b/firmware/export/mcf5249.h                                |    3 +
 b/firmware/export/pnx0101.h                                |    3 +
 b/firmware/export/pp5002.h                                 |    4 +
 b/firmware/export/pp5020.h                                 |    4 +
 b/firmware/export/s3c2440.h                                |    7 ++
 b/firmware/export/sh7034.h                                 |    3 +
 b/firmware/export/tcc77x.h                                 |    4 +
 b/firmware/export/tcc780x.h                                |    4 +
 b/firmware/export/timer.h                                  |   15 -----
 b/firmware/target/arm/as3525/kernel-as3525.c               |    2 
 a/firmware/target/arm/as3525/timer-target.h                |   26 ---------
 a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h   |   28 ----------
 a/firmware/target/arm/imx31/gigabeat-s/timer-target.h      |   27 ----------
 b/firmware/target/arm/pnx0101/timer-pnx0101.c              |    1 
 a/firmware/target/arm/pnx0101/timer-target.h               |   26 ---------
 a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h   |   28 ----------
 b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c |    2 
 a/firmware/target/arm/tcc77x/timer-target.h                |   27 ----------
 a/firmware/target/arm/tcc780x/timer-target.h               |   27 ----------
 b/firmware/target/arm/timer-pp.c                           |    1 
 a/firmware/target/arm/timer-target.h                       |   34 -------------
 a/firmware/target/arm/tms320dm320/timer-target.h           |   27 ----------
 b/firmware/target/coldfire/timer-coldfire.c                |    1 
 a/firmware/target/coldfire/timer-target.h                  |   27 ----------
 a/firmware/target/mips/ingenic_jz47xx/timer-target.h       |   29 -----------
 b/firmware/target/sh/archos/timer-archos.c                 |    1 
 a/firmware/target/sh/archos/timer-target.h                 |   28 ----------
 32 files changed, 54 insertions(+), 353 deletions(-)

This task depends upon

Closed by Rafaël Carré (funman)
Monday, 29 June 2009, 16:29 GMT+2
Reason for closing: Accepted

Comments (0)
Related Tasks (0/0)

	Tasks related to this task (0)

Duplicate tasks of this task (0)

Rockbox

FS#10274 - Move timer code in target tree

Details

Loading...