FS#5890 : Target tree architecture for iPod 4G Grayscale

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

Quick links: Bugs · Patches · Rockbox frontpage

FS#5890 - Target tree architecture for iPod 4G Grayscale

Attached to Project: Rockbox
Opened by Ghislain MARY (lunacymaze) - Sunday, 27 August 2006, 10:55 GMT+2
Last edited by Barry Wardell (barrywardell) - Saturday, 30 September 2006, 02:36 GMT+2

Task Type	Patches
Category	Build environment
Status	Closed
Assigned To	Barry Wardell (barrywardell)
Player Type	iPod 4G Grayscale
Severity	Low
Priority	Normal
Reported Version
Due in Version	Undecided
Due Date	Undecided
Percent Complete
Private	No

Details

Use the target tree architecture to build the iPod 4G Grayscale firmware.

It would be great to do it for the other iPods, and I could do it but I can only test on an iPod 4G Grayscale.

ipod4g_target_tree.patch (26.7 KiB)

 tools/configure                                     |    4 
 firmware/export/config-ipod4g.h                     |    2 
 firmware/SOURCES                                    |   12 +
 firmware/target/arm/apple/ipod4g/button-ipod4g.c    |  220 ++++++++++++++++++++
 firmware/target/arm/apple/ipod4g/adc-target.h       |   30 ++
 firmware/target/arm/apple/ipod4g/power-ipod4g.c     |   65 +++++
 firmware/target/arm/apple/ipod4g/backlight-target.h |   25 ++
 firmware/target/arm/apple/ipod4g/usb-target.h       |   26 ++
 firmware/target/arm/apple/ipod4g/button-target.h    |   55 +++++
 firmware/target/arm/apple/ipod4g/adc-ipod4g.c       |   79 +++++++
 firmware/target/arm/apple/ipod4g/backlight-ipod4g.c |   39 +++
 firmware/target/arm/apple/ipod4g/usb-ipod4g.c       |  105 +++++++++
 firmware/usb.c                                      |    3 
 firmware/drivers/button.c                           |    8 
 14 files changed, 666 insertions(+), 7 deletions(-)

This task depends upon

Closed by Barry Wardell (barrywardell)
Thursday, 05 October 2006, 16:52 GMT+2
Reason for closing: Accepted
Additional comments about closing: Most recent patch committed to CVS.

Comments (8)
Related Tasks (0/0)

Comment by Barry Wardell (barrywardell) - Saturday, 30 September 2006, 01:13 GMT+2

I've expanded greatly upon this patch and moved all iPods to the target tree. All iPod targets build, and I have tested the Color/Photo build on an actual iPod without any noticable problems. Can others please test this on other models?

There is some code duplication, particularly in ipod4g_button_read(), and quite a lot of #ifdef's in the Rockbox code, but this is a start at least.

ipod_target_tree.patch (137.4 KiB)

 firmware/target/arm/apple/adc-apple.c                       |   80 ++
 firmware/target/arm/apple/adc-target.h                      |   29 
 firmware/target/arm/apple/backlight-target.h                |   25 
 firmware/target/arm/apple/button-target.h                   |   61 +
 firmware/target/arm/apple/ipod3g/backlight-ipod3g.c         |   42 +
 firmware/target/arm/apple/ipod3g/backlight-target.h         |   25 
 firmware/target/arm/apple/ipod3g/button-ipod3g.c            |  189 +++++
 firmware/target/arm/apple/ipod4g/backlight-ipod4g.c         |   48 +
 firmware/target/arm/apple/ipod4g/button-ipod4g.c            |  211 +++++
 firmware/target/arm/apple/ipodcolor/backlight-ipodcolor.c   |   48 +
 firmware/target/arm/apple/ipodcolor/button-ipodcolor.c      |  211 +++++
 firmware/target/arm/apple/ipodmini/backlight-ipodmini.c     |   44 +
 firmware/target/arm/apple/ipodmini/button-ipodmini.c        |  213 ++++++
 firmware/target/arm/apple/ipodmini2g/backlight-ipodmini2g.c |   44 +
 firmware/target/arm/apple/ipodmini2g/button-ipodmini2g.c    |  211 +++++
 firmware/target/arm/apple/ipodnano/backlight-ipodnano.c     |   50 +
 firmware/target/arm/apple/ipodnano/button-ipodnano.c        |  211 +++++
 firmware/target/arm/apple/ipodvideo/backlight-ipodvideo.c   |   50 +
 firmware/target/arm/apple/ipodvideo/button-ipodvideo.c      |  211 +++++
 firmware/target/arm/apple/ipodvideo/lcd-ipodvideo.c         |  389 +++++++++++
 firmware/target/arm/apple/ipodvideo/power-ipodvideo.c       |   74 ++
 firmware/target/arm/apple/power-apple.c                     |   77 ++
 firmware/target/arm/apple/usb-apple.c                       |  114 +++
 firmware/target/arm/apple/usb-target.h                      |   24 
 firmware/SOURCES                                            |   99 ++
 firmware/backlight.c                                        |   32 
 firmware/powermgmt.c                                        |    9 
 firmware/usb.c                                              |   60 -
 firmware/drivers/adc.c                                      |   57 -
 firmware/drivers/button.c                                   |  424 ------------
 firmware/drivers/lcd-ipodvideo.c                            |  389 -----------
 firmware/drivers/power.c                                    |   20 
 firmware/export/adc.h                                       |    9 
 firmware/export/button.h                                    |   28 
 firmware/export/config-ipod3g.h                             |    5 
 firmware/export/config-ipod4g.h                             |    6 
 firmware/export/config-ipodcolor.h                          |    2 
 firmware/export/config-ipodmini.h                           |    6 
 firmware/export/config-ipodmini2g.h                         |    6 
 firmware/export/config-ipodnano.h                           |    2 
 firmware/export/config-ipodvideo.h                          |    2 
 firmware/export/pcf50605.h                                  |    2 
 tools/configure                                             |   28 
 43 files changed, 2829 insertions(+), 1038 deletions(-)

Comment by Barry Wardell (barrywardell) - Sunday, 01 October 2006, 04:01 GMT+2

I missed a couple of changes in my last patch. Here's an updated one which should compile OK.

ipod_target_tree.patch (145.1 KiB)

 rockbox-devel-ipod-target-tree/firmware/SOURCES                                            |   99 ++
 rockbox-devel-ipod-target-tree/firmware/backlight.c                                        |   32 
 rockbox-devel-ipod-target-tree/firmware/drivers/adc.c                                      |   57 -
 rockbox-devel-ipod-target-tree/firmware/drivers/button.c                                   |  424 ----------
 rockbox-devel-ipod-target-tree/firmware/drivers/lcd-ipodvideo.c                            |  389 ---------
 rockbox-devel-ipod-target-tree/firmware/drivers/power.c                                    |   20 
 rockbox-devel-ipod-target-tree/firmware/export/adc.h                                       |    9 
 rockbox-devel-ipod-target-tree/firmware/export/button.h                                    |   28 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipod3g.h                             |    5 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipod4g.h                             |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodcolor.h                          |    2 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodmini.h                           |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodmini2g.h                         |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodnano.h                           |    2 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodvideo.h                          |    2 
 rockbox-devel-ipod-target-tree/firmware/export/pcf50605.h                                  |    2 
 rockbox-devel-ipod-target-tree/firmware/powermgmt.c                                        |    9 
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/adc-apple.c                       |   80 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/adc-target.h                      |   29 
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/backlight-target.h                |   25 
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/button-target.h                   |   61 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipod3g/backlight-ipod3g.c         |   42 
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipod3g/backlight-target.h         |   25 
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipod3g/button-ipod3g.c            |  189 ++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipod4g/backlight-ipod4g.c         |   48 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipod4g/button-ipod4g.c            |  237 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodcolor/backlight-ipodcolor.c   |   48 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodcolor/button-ipodcolor.c      |  237 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodmini/backlight-ipodmini.c     |   44 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodmini/button-ipodmini.c        |  217 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodmini2g/backlight-ipodmini2g.c |   44 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodmini2g/button-ipodmini2g.c    |  237 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodnano/backlight-ipodnano.c     |   50 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodnano/button-ipodnano.c        |  237 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodvideo/backlight-ipodvideo.c   |   50 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodvideo/button-ipodvideo.c      |  237 +++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodvideo/lcd-ipodvideo.c         |  389 +++++++++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/ipodvideo/power-ipodvideo.c       |   74 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/power-apple.c                     |   77 +
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/usb-apple.c                       |  114 ++
 rockbox-devel-ipod-target-tree/firmware/target/arm/apple/usb-target.h                      |   24 
 rockbox-devel-ipod-target-tree/firmware/usb.c                                              |   60 -
 rockbox-devel-ipod-target-tree/tools/configure                                             |   28 
 43 files changed, 2963 insertions(+), 1038 deletions(-)

Comment by Barry Wardell (barrywardell) - Sunday, 01 October 2006, 04:35 GMT+2

Updated again. Moved the common 4g button code into a single file.

ipod_target_tree.patch (48.9 KiB)

 rockbox-devel-ipod-target-tree/firmware/SOURCES                    |   99 ++
 rockbox-devel-ipod-target-tree/firmware/backlight.c                |   32 
 rockbox-devel-ipod-target-tree/firmware/drivers/adc.c              |   57 -
 rockbox-devel-ipod-target-tree/firmware/drivers/button.c           |  424 ----------
 rockbox-devel-ipod-target-tree/firmware/drivers/lcd-ipodvideo.c    |  389 ---------
 rockbox-devel-ipod-target-tree/firmware/drivers/power.c            |   20 
 rockbox-devel-ipod-target-tree/firmware/export/adc.h               |    9 
 rockbox-devel-ipod-target-tree/firmware/export/button.h            |   28 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipod3g.h     |    5 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipod4g.h     |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodcolor.h  |    2 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodmini.h   |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodmini2g.h |    6 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodnano.h   |    2 
 rockbox-devel-ipod-target-tree/firmware/export/config-ipodvideo.h  |    2 
 rockbox-devel-ipod-target-tree/firmware/export/pcf50605.h          |    2 
 rockbox-devel-ipod-target-tree/firmware/powermgmt.c                |    9 
 rockbox-devel-ipod-target-tree/firmware/usb.c                      |   60 -
 rockbox-devel-ipod-target-tree/tools/configure                     |   28 
 19 files changed, 148 insertions(+), 1038 deletions(-)

Comment by Barry Wardell (barrywardell) - Sunday, 01 October 2006, 18:56 GMT+2

Looks like I missed a load of files in the last patch. Hopefully this one will work.

ipod_target_tree.patch (114.3 KiB)

 firmware/SOURCES                                            |   99 ++
 firmware/backlight.c                                        |   32 
 firmware/powermgmt.c                                        |    9 
 firmware/usb.c                                              |   60 -
 firmware/drivers/adc.c                                      |   57 -
 firmware/drivers/button.c                                   |  424 ------------
 firmware/drivers/lcd-ipodvideo.c                            |  389 -----------
 firmware/drivers/power.c                                    |   20 
 firmware/export/adc.h                                       |    9 
 firmware/export/button.h                                    |   28 
 firmware/export/config-ipod3g.h                             |    5 
 firmware/export/config-ipod4g.h                             |    6 
 firmware/export/config-ipodcolor.h                          |    2 
 firmware/export/config-ipodmini.h                           |    6 
 firmware/export/config-ipodmini2g.h                         |    6 
 firmware/export/config-ipodnano.h                           |    2 
 firmware/export/config-ipodvideo.h                          |    2 
 firmware/export/pcf50605.h                                  |    2 
 firmware/target/arm/apple/adc-apple.c                       |   80 ++
 firmware/target/arm/apple/adc-target.h                      |   29 
 firmware/target/arm/apple/backlight-target.h                |   25 
 firmware/target/arm/apple/button-apple-4g.c                 |  237 ++++++
 firmware/target/arm/apple/button-target.h                   |   61 +
 firmware/target/arm/apple/power-apple.c                     |   77 ++
 firmware/target/arm/apple/usb-apple.c                       |  114 +++
 firmware/target/arm/apple/usb-target.h                      |   24 
 firmware/target/arm/apple/ipod3g/backlight-ipod3g.c         |   42 +
 firmware/target/arm/apple/ipod3g/backlight-target.h         |   25 
 firmware/target/arm/apple/ipod3g/button-ipod3g.c            |  189 +++++
 firmware/target/arm/apple/ipod4g/backlight-ipod4g.c         |   48 +
 firmware/target/arm/apple/ipodcolor/backlight-ipodcolor.c   |   48 +
 firmware/target/arm/apple/ipodmini/backlight-ipodmini.c     |   44 +
 firmware/target/arm/apple/ipodmini/button-ipodmini.c        |  217 ++++++
 firmware/target/arm/apple/ipodmini2g/backlight-ipodmini2g.c |   44 +
 firmware/target/arm/apple/ipodnano/backlight-ipodnano.c     |   50 +
 firmware/target/arm/apple/ipodvideo/backlight-ipodvideo.c   |   50 +
 firmware/target/arm/apple/ipodvideo/lcd-ipodvideo.c         |  389 +++++++++++
 firmware/target/arm/apple/ipodvideo/power-ipodvideo.c       |   74 ++
 tools/configure                                             |   28 
 39 files changed, 2015 insertions(+), 1038 deletions(-)

Comment by Barry Wardell (barrywardell) - Monday, 02 October 2006, 03:09 GMT+2

Added DEFAULT_CONTRAST_SETTING for grayscale ipods which was stopping them from compiling.

ipod_target_tree.patch (115.2 KiB)

 firmware/FILES                                              |    8 
 firmware/SOURCES                                            |   99 ++
 firmware/backlight.c                                        |   32 
 firmware/powermgmt.c                                        |    9 
 firmware/usb.c                                              |   60 -
 firmware/drivers/adc.c                                      |   57 -
 firmware/drivers/button.c                                   |  424 ------------
 firmware/drivers/lcd-ipodvideo.c                            |  389 -----------
 firmware/drivers/power.c                                    |   20 
 firmware/export/adc.h                                       |    9 
 firmware/export/button.h                                    |   28 
 firmware/export/config-ipod3g.h                             |    6 
 firmware/export/config-ipod4g.h                             |    7 
 firmware/export/config-ipodcolor.h                          |    2 
 firmware/export/config-ipodmini.h                           |    7 
 firmware/export/config-ipodmini2g.h                         |    7 
 firmware/export/config-ipodnano.h                           |    2 
 firmware/export/config-ipodvideo.h                          |    2 
 firmware/export/pcf50605.h                                  |    2 
 firmware/target/arm/apple/adc-apple.c                       |   80 ++
 firmware/target/arm/apple/adc-target.h                      |   29 
 firmware/target/arm/apple/backlight-target.h                |   25 
 firmware/target/arm/apple/button-apple-4g.c                 |  237 ++++++
 firmware/target/arm/apple/button-target.h                   |   61 +
 firmware/target/arm/apple/power-apple.c                     |   77 ++
 firmware/target/arm/apple/usb-apple.c                       |  114 +++
 firmware/target/arm/apple/usb-target.h                      |   24 
 firmware/target/arm/apple/ipod3g/backlight-ipod3g.c         |   42 +
 firmware/target/arm/apple/ipod3g/backlight-target.h         |   25 
 firmware/target/arm/apple/ipod3g/button-ipod3g.c            |  189 +++++
 firmware/target/arm/apple/ipod4g/backlight-ipod4g.c         |   48 +
 firmware/target/arm/apple/ipodcolor/backlight-ipodcolor.c   |   48 +
 firmware/target/arm/apple/ipodmini/backlight-ipodmini.c     |   44 +
 firmware/target/arm/apple/ipodmini/button-ipodmini.c        |  217 ++++++
 firmware/target/arm/apple/ipodmini2g/backlight-ipodmini2g.c |   44 +
 firmware/target/arm/apple/ipodnano/backlight-ipodnano.c     |   50 +
 firmware/target/arm/apple/ipodvideo/backlight-ipodvideo.c   |   50 +
 firmware/target/arm/apple/ipodvideo/lcd-ipodvideo.c         |  389 +++++++++++
 firmware/target/arm/apple/ipodvideo/power-ipodvideo.c       |   74 ++
 tools/configure                                             |   28 
 40 files changed, 2027 insertions(+), 1038 deletions(-)

Comment by Barry Wardell (barrywardell) - Wednesday, 04 October 2006, 16:46 GMT+2

Updated patch. Renamed apple directory to ipod. Combined all the common backlight and power code into files shared between models. No need for most of the model specific subdirs any more, so remove them.

ipod_target_tree.patch (77.7 KiB)

 firmware/FILES                                     |    2 
 firmware/SOURCES                                   |   99 ++++
 firmware/backlight.c                               |   32 -
 firmware/powermgmt.c                               |    9 
 firmware/usb.c                                     |   60 --
 firmware/drivers/adc.c                             |   57 --
 firmware/drivers/button.c                          |  424 ---------------------
 firmware/drivers/power.c                           |   20 
 firmware/export/adc.h                              |    9 
 firmware/export/button.h                           |   28 -
 firmware/export/config-ipod3g.h                    |    6 
 firmware/export/config-ipod4g.h                    |    7 
 firmware/export/config-ipodcolor.h                 |    2 
 firmware/export/config-ipodmini.h                  |    7 
 firmware/export/config-ipodmini2g.h                |    7 
 firmware/export/config-ipodnano.h                  |    2 
 firmware/export/config-ipodvideo.h                 |    2 
 firmware/export/pcf50605.h                         |    2 
 tools/configure                                    |   28 +
 firmware/target/arm/ipod/3g/backlight-3g.c         |   42 ++
 firmware/target/arm/ipod/3g/button-3g.c            |  189 +++++++++
 firmware/target/arm/ipod/adc-ipod.c                |   80 +++
 firmware/target/arm/ipod/adc-target.h              |   29 +
 firmware/target/arm/ipod/backlight-4g_color.c      |   48 ++
 firmware/target/arm/ipod/backlight-mini1g_mini2g.c |   44 ++
 firmware/target/arm/ipod/backlight-nano_video.c    |   50 ++
 firmware/target/arm/ipod/backlight-target.h        |   25 +
 firmware/target/arm/ipod/button-clickwheel.c       |  237 +++++++++++
 firmware/target/arm/ipod/button-mini1g.c           |  217 ++++++++++
 firmware/target/arm/ipod/button-target.h           |   61 +++
 firmware/target/arm/ipod/power-ipod.c              |   81 ++++
 firmware/target/arm/ipod/usb-ipod.c                |  114 +++++
 firmware/target/arm/ipod/usb-target.h              |   24 +
 33 files changed, 1395 insertions(+), 649 deletions(-)

Comment by Daniel Ankers (dan_a) - Wednesday, 04 October 2006, 20:05 GMT+2

I can confirm that this patch works with a 3G iPod

Comment by Robert Keevil (obo) - Wednesday, 04 October 2006, 20:32 GMT+2

And also a 5G.

	Tasks related to this task (0)

Duplicate tasks of this task (0)

Rockbox

FS#5890 - Target tree architecture for iPod 4G Grayscale

Details

Loading...