summaryrefslogtreecommitdiffstats
path: root/bootloader/ipod.c
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2007-03-03 17:25:20 +0000
committerBarry Wardell <rockbox@barrywardell.net>2007-03-03 17:25:20 +0000
commit8b061252c4359aa960ae31c0a4b2ba92f6771017 (patch)
treeaad5ba8e1defbf09e68887d6d06db362e66f3b67 /bootloader/ipod.c
parenta7311331d551cb09b0573a7935915de6dc54a4d1 (diff)
downloadrockbox-8b061252c4359aa960ae31c0a4b2ba92f6771017.tar.gz
rockbox-8b061252c4359aa960ae31c0a4b2ba92f6771017.tar.bz2
rockbox-8b061252c4359aa960ae31c0a4b2ba92f6771017.zip
Replace some inl/outl with register #define's instead. Also tidy up pp5020.h so that it's in increasing address order.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12574 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/ipod.c')
-rw-r--r--bootloader/ipod.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index 73b4fffc71..0600ea62c1 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -82,14 +82,14 @@ static void ser_opto_keypad_cfg(int val)
{
int start_time;
- outl(inl(0x6000d004) & ~0x80, 0x6000d004);
+ GPIOB_ENABLE &=~ 0x80;
outl(inl(0x7000c104) | 0xc000000, 0x7000c104);
outl(val, 0x7000c120);
outl(inl(0x7000c100) | 0x80000000, 0x7000c100);
- outl(inl(0x6000d024) & ~0x10, 0x6000d024);
- outl(inl(0x6000d014) | 0x10, 0x6000d014);
+ GPIOB_OUTPUT_VAL &=~ 0x10;
+ GPIOB_OUTPUT_EN |= 0x10;
start_time = USEC_TIMER;
do {
@@ -100,9 +100,9 @@ static void ser_opto_keypad_cfg(int val)
outl(inl(0x7000c100) & ~0x80000000, 0x7000c100);
- outl(inl(0x6000d004) | 0x80, 0x6000d004);
- outl(inl(0x6000d024) | 0x10, 0x6000d024);
- outl(inl(0x6000d014) & ~0x10, 0x6000d014);
+ GPIOB_ENABLE |= 0x80;
+ GPIOB_OUTPUT_VAL |= 0x10;
+ GPIOB_OUTPUT_EN &=~0x10;
outl(inl(0x7000c104) | 0xc000000, 0x7000c104);
outl(inl(0x7000c100) | 0x60000000, 0x7000c100);
@@ -253,7 +253,7 @@ void* main(void)
outl(((0x100 | 1) << 3), 0x6000d824);
/* set port L07 on */
- outl(((0x100 | 1) << 7), 0x6000d12c);
+ GPIOL_OUTPUT_VAL = ((0x100 | 1) << 7);
#elif CONFIG_BACKLIGHT==BL_IPOD3G
outl(inl(IPOD_LCD_BASE) | 0x2, IPOD_LCD_BASE);
#endif