diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/rockboy/cpu-gb.h (renamed from apps/plugins/rockboy/cpu.h) | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/cpu.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/cpuregs.h | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/debug.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/dynarec.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/emu.c | 6 | ||||
-rw-r--r-- | apps/plugins/rockboy/hw.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/lcd-gb.h (renamed from apps/plugins/rockboy/lcd.h) | 16 | ||||
-rw-r--r-- | apps/plugins/rockboy/lcd.c | 3 | ||||
-rw-r--r-- | apps/plugins/rockboy/lcdc.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/loader.c | 3 | ||||
-rw-r--r-- | apps/plugins/rockboy/mem.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockmacros.h | 20 | ||||
-rw-r--r-- | apps/plugins/rockboy/rtc-gb.h (renamed from apps/plugins/rockboy/rtc.h) | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/rtc.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/save.c | 6 | ||||
-rw-r--r-- | apps/plugins/rockboy/sound.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/sys_rockbox.c | 2 |
18 files changed, 33 insertions, 55 deletions
diff --git a/apps/plugins/rockboy/cpu.h b/apps/plugins/rockboy/cpu-gb.h index c7ec36ccf8..937b477b53 100644 --- a/apps/plugins/rockboy/cpu.h +++ b/apps/plugins/rockboy/cpu-gb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #ifndef __CPU_H__ | 3 | #ifndef __CPU_GB_H__ |
4 | #define __CPU_H__ | 4 | #define __CPU_GB_H__ |
5 | 5 | ||
6 | 6 | ||
7 | 7 | ||
diff --git a/apps/plugins/rockboy/cpu.c b/apps/plugins/rockboy/cpu.c index 60c76a1302..6118633899 100644 --- a/apps/plugins/rockboy/cpu.c +++ b/apps/plugins/rockboy/cpu.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "defs.h" | 5 | #include "defs.h" |
6 | #include "regs.h" | 6 | #include "regs.h" |
7 | #include "hw.h" | 7 | #include "hw.h" |
8 | #include "cpu.h" | 8 | #include "cpu-gb.h" |
9 | #include "lcdc.h" | 9 | #include "lcdc.h" |
10 | #include "mem.h" | 10 | #include "mem.h" |
11 | #include "fastmem.h" | 11 | #include "fastmem.h" |
diff --git a/apps/plugins/rockboy/cpuregs.h b/apps/plugins/rockboy/cpuregs.h index e4b1426a3e..3b7d5eda27 100644 --- a/apps/plugins/rockboy/cpuregs.h +++ b/apps/plugins/rockboy/cpuregs.h | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | 8 | ||
9 | #include "defs.h" | 9 | #include "defs.h" |
10 | #include "cpu.h" | 10 | #include "cpu-gb.h" |
11 | 11 | ||
12 | #define LB(r) ((r).b[LO][LO]) | 12 | #define LB(r) ((r).b[LO][LO]) |
13 | #define HB(r) ((r).b[LO][HI]) | 13 | #define HB(r) ((r).b[LO][HI]) |
diff --git a/apps/plugins/rockboy/debug.c b/apps/plugins/rockboy/debug.c index d0e106ba94..8459ad3d5b 100644 --- a/apps/plugins/rockboy/debug.c +++ b/apps/plugins/rockboy/debug.c | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | #include "rockmacros.h" | 5 | #include "rockmacros.h" |
6 | #include "defs.h" | 6 | #include "defs.h" |
7 | #include "cpu.h" | 7 | #include "cpu-gb.h" |
8 | #include "mem.h" | 8 | #include "mem.h" |
9 | #include "fastmem.h" | 9 | #include "fastmem.h" |
10 | #include "regs.h" | 10 | #include "regs.h" |
diff --git a/apps/plugins/rockboy/dynarec.c b/apps/plugins/rockboy/dynarec.c index 14ec7a5ca9..6d424a047f 100644 --- a/apps/plugins/rockboy/dynarec.c +++ b/apps/plugins/rockboy/dynarec.c | |||
@@ -4,7 +4,7 @@ | |||
4 | #include "defs.h" | 4 | #include "defs.h" |
5 | #include "regs.h" | 5 | #include "regs.h" |
6 | #include "hw.h" | 6 | #include "hw.h" |
7 | #include "cpu.h" | 7 | #include "cpu-gb.h" |
8 | #include "lcdc.h" | 8 | #include "lcdc.h" |
9 | #include "mem.h" | 9 | #include "mem.h" |
10 | #include "fastmem.h" | 10 | #include "fastmem.h" |
diff --git a/apps/plugins/rockboy/emu.c b/apps/plugins/rockboy/emu.c index 18a9edb324..57385f8e5f 100644 --- a/apps/plugins/rockboy/emu.c +++ b/apps/plugins/rockboy/emu.c | |||
@@ -5,12 +5,12 @@ | |||
5 | #include "defs.h" | 5 | #include "defs.h" |
6 | #include "regs.h" | 6 | #include "regs.h" |
7 | #include "hw.h" | 7 | #include "hw.h" |
8 | #include "cpu.h" | 8 | #include "cpu-gb.h" |
9 | #include "mem.h" | 9 | #include "mem.h" |
10 | #include "lcd.h" | 10 | #include "lcd-gb.h" |
11 | #include "rc.h" | 11 | #include "rc.h" |
12 | #include "sound.h" | 12 | #include "sound.h" |
13 | #include "rtc.h" | 13 | #include "rtc-gb.h" |
14 | 14 | ||
15 | static int framelen = 16743; | 15 | static int framelen = 16743; |
16 | static int framecount; | 16 | static int framecount; |
diff --git a/apps/plugins/rockboy/hw.c b/apps/plugins/rockboy/hw.c index c287e24f8a..794e4e4516 100644 --- a/apps/plugins/rockboy/hw.c +++ b/apps/plugins/rockboy/hw.c | |||
@@ -3,10 +3,10 @@ | |||
3 | 3 | ||
4 | #include "rockmacros.h" | 4 | #include "rockmacros.h" |
5 | #include "defs.h" | 5 | #include "defs.h" |
6 | #include "cpu.h" | 6 | #include "cpu-gb.h" |
7 | #include "hw.h" | 7 | #include "hw.h" |
8 | #include "regs.h" | 8 | #include "regs.h" |
9 | #include "lcd.h" | 9 | #include "lcd-gb.h" |
10 | #include "mem.h" | 10 | #include "mem.h" |
11 | #include "fastmem.h" | 11 | #include "fastmem.h" |
12 | 12 | ||
diff --git a/apps/plugins/rockboy/lcd.h b/apps/plugins/rockboy/lcd-gb.h index 776c8592f4..3a612887e5 100644 --- a/apps/plugins/rockboy/lcd.h +++ b/apps/plugins/rockboy/lcd-gb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #ifndef __LCD_H__ | 3 | #ifndef __LCD_GB_H__ |
4 | #define __LCD_H__ | 4 | #define __LCD_GB_H__ |
5 | 5 | ||
6 | #include "defs.h" | 6 | #include "defs.h" |
7 | 7 | ||
@@ -52,13 +52,6 @@ extern struct lcd lcd; | |||
52 | extern struct scan scan; | 52 | extern struct scan scan; |
53 | 53 | ||
54 | 54 | ||
55 | |||
56 | |||
57 | |||
58 | #endif | ||
59 | |||
60 | |||
61 | |||
62 | void updatepatpix(void) ICODE_ATTR; | 55 | void updatepatpix(void) ICODE_ATTR; |
63 | void tilebuf(void); | 56 | void tilebuf(void); |
64 | void bg_scan(void); | 57 | void bg_scan(void); |
@@ -76,3 +69,8 @@ void vram_write(int a, byte b); | |||
76 | void vram_dirty(void); | 69 | void vram_dirty(void); |
77 | void pal_dirty(void); | 70 | void pal_dirty(void); |
78 | void lcd_reset(void); | 71 | void lcd_reset(void); |
72 | |||
73 | #endif | ||
74 | |||
75 | |||
76 | |||
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index 04ca06e958..651c82286f 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c | |||
@@ -1,12 +1,11 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include "config.h" | ||
4 | #include "rockmacros.h" | 3 | #include "rockmacros.h" |
5 | #include "defs.h" | 4 | #include "defs.h" |
6 | #include "regs.h" | 5 | #include "regs.h" |
7 | #include "hw.h" | 6 | #include "hw.h" |
8 | #include "mem.h" | 7 | #include "mem.h" |
9 | #include "lcd.h" | 8 | #include "lcd-gb.h" |
10 | #include "rc.h" | 9 | #include "rc.h" |
11 | #include "fb.h" | 10 | #include "fb.h" |
12 | #include "palette.h" | 11 | #include "palette.h" |
diff --git a/apps/plugins/rockboy/lcdc.c b/apps/plugins/rockboy/lcdc.c index c82b828354..3c1cf9196d 100644 --- a/apps/plugins/rockboy/lcdc.c +++ b/apps/plugins/rockboy/lcdc.c | |||
@@ -4,9 +4,9 @@ | |||
4 | 4 | ||
5 | #include "defs.h" | 5 | #include "defs.h" |
6 | #include "hw.h" | 6 | #include "hw.h" |
7 | #include "cpu.h" | 7 | #include "cpu-gb.h" |
8 | #include "regs.h" | 8 | #include "regs.h" |
9 | #include "lcd.h" | 9 | #include "lcd-gb.h" |
10 | 10 | ||
11 | 11 | ||
12 | #define C (cpu.lcdc) | 12 | #define C (cpu.lcdc) |
diff --git a/apps/plugins/rockboy/loader.c b/apps/plugins/rockboy/loader.c index dc89cddf8b..53839d6150 100644 --- a/apps/plugins/rockboy/loader.c +++ b/apps/plugins/rockboy/loader.c | |||
@@ -8,7 +8,8 @@ | |||
8 | #include "regs.h" | 8 | #include "regs.h" |
9 | #include "mem.h" | 9 | #include "mem.h" |
10 | #include "hw.h" | 10 | #include "hw.h" |
11 | #include "rtc.h" | 11 | #include "lcd-gb.h" |
12 | #include "rtc-gb.h" | ||
12 | #include "rc.h" | 13 | #include "rc.h" |
13 | #include "save.h" | 14 | #include "save.h" |
14 | #include "sound.h" | 15 | #include "sound.h" |
diff --git a/apps/plugins/rockboy/mem.c b/apps/plugins/rockboy/mem.c index 2e1e0e7154..6bfedcb6c8 100644 --- a/apps/plugins/rockboy/mem.c +++ b/apps/plugins/rockboy/mem.c | |||
@@ -6,8 +6,8 @@ | |||
6 | #include "hw.h" | 6 | #include "hw.h" |
7 | #include "regs.h" | 7 | #include "regs.h" |
8 | #include "mem.h" | 8 | #include "mem.h" |
9 | #include "rtc.h" | 9 | #include "rtc-gb.h" |
10 | #include "lcd.h" | 10 | #include "lcd-gb.h" |
11 | #include "lcdc.h" | 11 | #include "lcdc.h" |
12 | #include "sound.h" | 12 | #include "sound.h" |
13 | 13 | ||
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index e246086f05..71acfdbbcc 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h | |||
@@ -51,16 +51,6 @@ void savestate(int fd); | |||
51 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) | 51 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) |
52 | #define isalnum(c) (isdigit(c) || (isalpha(c))) | 52 | #define isalnum(c) (isdigit(c) || (isalpha(c))) |
53 | 53 | ||
54 | /* FIXME: This is a q&d fix for these #defines not being available from | ||
55 | * rockbox' lcd.h because rockboy has its own lcd.h. Renaming the file and | ||
56 | * adapting the other files produced weird errors I couldn't figure out | ||
57 | * -- amiconn 20050624 -- */ | ||
58 | #define DRMODE_COMPLEMENT 0 | ||
59 | #define DRMODE_BG 1 | ||
60 | #define DRMODE_FG 2 | ||
61 | #define DRMODE_SOLID 3 | ||
62 | #define DRMODE_INVERSEVID 4 /* used as bit modifier for basic modes */ | ||
63 | |||
64 | #ifdef SIMULATOR | 54 | #ifdef SIMULATOR |
65 | #undef opendir | 55 | #undef opendir |
66 | #define opendir(a) rb->sim_opendir((a)) | 56 | #define opendir(a) rb->sim_opendir((a)) |
@@ -72,22 +62,12 @@ void savestate(int fd); | |||
72 | #define open(a,b) rb->sim_open((a),(b)) | 62 | #define open(a,b) rb->sim_open((a),(b)) |
73 | #undef lseek | 63 | #undef lseek |
74 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) | 64 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) |
75 | #define ICODE_ATTR | ||
76 | #define IDATA_ATTR | ||
77 | #else /* !SIMULATOR */ | 65 | #else /* !SIMULATOR */ |
78 | #define opendir(a) rb->opendir((a)) | 66 | #define opendir(a) rb->opendir((a)) |
79 | #define closedir(a) rb->closedir((a)) | 67 | #define closedir(a) rb->closedir((a)) |
80 | #define mkdir(a,b) rb->mkdir((a),(b)) | 68 | #define mkdir(a,b) rb->mkdir((a),(b)) |
81 | #define open(a,b) rb->open((a),(b)) | 69 | #define open(a,b) rb->open((a),(b)) |
82 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) | 70 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) |
83 | #if CONFIG_CPU == MCF5249 | ||
84 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | ||
85 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | ||
86 | #define USE_IRAM 1 | ||
87 | #else | ||
88 | #define ICODE_ATTR | ||
89 | #define IDATA_ATTR | ||
90 | #endif | ||
91 | #endif /* !SIMULATOR */ | 71 | #endif /* !SIMULATOR */ |
92 | 72 | ||
93 | #define strcat(a,b) rb->strcat((a),(b)) | 73 | #define strcat(a,b) rb->strcat((a),(b)) |
diff --git a/apps/plugins/rockboy/rtc.h b/apps/plugins/rockboy/rtc-gb.h index 2665cd81c3..39c6145161 100644 --- a/apps/plugins/rockboy/rtc.h +++ b/apps/plugins/rockboy/rtc-gb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #ifndef __RTC_H__ | 3 | #ifndef __RTC_GB_H__ |
4 | #define __RTC_H__ | 4 | #define __RTC_GB_H__ |
5 | 5 | ||
6 | 6 | ||
7 | struct rtc | 7 | struct rtc |
diff --git a/apps/plugins/rockboy/rtc.c b/apps/plugins/rockboy/rtc.c index 99e71dcfae..51c641cdce 100644 --- a/apps/plugins/rockboy/rtc.c +++ b/apps/plugins/rockboy/rtc.c | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #include "defs.h" | 7 | #include "defs.h" |
8 | #include "mem.h" | 8 | #include "mem.h" |
9 | #include "rtc.h" | 9 | #include "rtc-gb.h" |
10 | #include "rc.h" | 10 | #include "rc.h" |
11 | 11 | ||
12 | struct rtc rtc; | 12 | struct rtc rtc; |
diff --git a/apps/plugins/rockboy/save.c b/apps/plugins/rockboy/save.c index f14a7191c1..0277eb53d1 100644 --- a/apps/plugins/rockboy/save.c +++ b/apps/plugins/rockboy/save.c | |||
@@ -4,12 +4,12 @@ | |||
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | 5 | ||
6 | #include "defs.h" | 6 | #include "defs.h" |
7 | #include "cpu.h" | 7 | #include "cpu-gb.h" |
8 | #include "cpuregs.h" | 8 | #include "cpuregs.h" |
9 | #include "hw.h" | 9 | #include "hw.h" |
10 | #include "regs.h" | 10 | #include "regs.h" |
11 | #include "lcd.h" | 11 | #include "lcd-gb.h" |
12 | #include "rtc.h" | 12 | #include "rtc-gb.h" |
13 | #include "mem.h" | 13 | #include "mem.h" |
14 | #include "sound.h" | 14 | #include "sound.h" |
15 | 15 | ||
diff --git a/apps/plugins/rockboy/sound.c b/apps/plugins/rockboy/sound.c index 10fc504063..accfda2540 100644 --- a/apps/plugins/rockboy/sound.c +++ b/apps/plugins/rockboy/sound.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "defs.h" | 5 | #include "defs.h" |
6 | #include "pcm.h" | 6 | #include "pcm.h" |
7 | #include "sound.h" | 7 | #include "sound.h" |
8 | #include "cpu.h" | 8 | #include "cpu-gb.h" |
9 | #include "hw.h" | 9 | #include "hw.h" |
10 | #include "regs.h" | 10 | #include "regs.h" |
11 | #include "rc.h" | 11 | #include "rc.h" |
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 0d4426987a..45608b9f36 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "fb.h" | 21 | #include "fb.h" |
22 | #include "input.h" | 22 | #include "input.h" |
23 | #include "rc.h" | 23 | #include "rc.h" |
24 | #include "lcd.h" | 24 | #include "lcd-gb.h" |
25 | #include "hw.h" | 25 | #include "hw.h" |
26 | #include "config.h" | 26 | #include "config.h" |
27 | 27 | ||