diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-c100.h | 8 | ||||
-rw-r--r-- | firmware/export/config-cowond2.h | 7 | ||||
-rw-r--r-- | firmware/export/config-iaudio7.h | 8 | ||||
-rw-r--r-- | firmware/export/config-logikdax.h | 8 | ||||
-rw-r--r-- | firmware/export/config-m200.h | 8 | ||||
-rw-r--r-- | firmware/export/storage.h | 10 |
6 files changed, 30 insertions, 19 deletions
diff --git a/firmware/export/config-c100.h b/firmware/export/config-c100.h index 9a2664202a..cedc7c3aed 100644 --- a/firmware/export/config-c100.h +++ b/firmware/export/config-c100.h | |||
@@ -39,6 +39,10 @@ | |||
39 | /* define this if you have a flash memory storage */ | 39 | /* define this if you have a flash memory storage */ |
40 | #define HAVE_FLASH_STORAGE | 40 | #define HAVE_FLASH_STORAGE |
41 | 41 | ||
42 | #define CONFIG_STORAGE STORAGE_NAND | ||
43 | |||
44 | #define CONFIG_NAND NAND_TCC | ||
45 | |||
42 | /* LCD dimensions */ | 46 | /* LCD dimensions */ |
43 | #define LCD_WIDTH 128 | 47 | #define LCD_WIDTH 128 |
44 | #define LCD_HEIGHT 64 | 48 | #define LCD_HEIGHT 64 |
@@ -120,8 +124,4 @@ | |||
120 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 124 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
121 | #define BOOTDIR "/" | 125 | #define BOOTDIR "/" |
122 | 126 | ||
123 | #define CONFIG_STORAGE STORAGE_NAND | ||
124 | |||
125 | #define CONFIG_NAND NAND_TCC | ||
126 | |||
127 | #endif /* SIMULATOR */ | 127 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 749eb0b882..18a80f2791 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -48,6 +48,10 @@ | |||
48 | /* define this if you have a flash memory storage */ | 48 | /* define this if you have a flash memory storage */ |
49 | #define HAVE_FLASH_STORAGE | 49 | #define HAVE_FLASH_STORAGE |
50 | 50 | ||
51 | #define CONFIG_STORAGE STORAGE_NAND | ||
52 | |||
53 | #define CONFIG_NAND NAND_TCC | ||
54 | |||
51 | /* Some (2Gb?) D2s seem to be FAT16 formatted */ | 55 | /* Some (2Gb?) D2s seem to be FAT16 formatted */ |
52 | #define HAVE_FAT16SUPPORT | 56 | #define HAVE_FAT16SUPPORT |
53 | 57 | ||
@@ -145,8 +149,5 @@ | |||
145 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 149 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
146 | #define BOOTDIR "/.rockbox" | 150 | #define BOOTDIR "/.rockbox" |
147 | 151 | ||
148 | #define CONFIG_STORAGE STORAGE_NAND | ||
149 | |||
150 | #define CONFIG_NAND NAND_TCC | ||
151 | 152 | ||
152 | #endif /* SIMULATOR */ | 153 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h index ca6212d305..a5dd30d568 100644 --- a/firmware/export/config-iaudio7.h +++ b/firmware/export/config-iaudio7.h | |||
@@ -69,6 +69,10 @@ | |||
69 | /* define this if you have a flash memory storage */ | 69 | /* define this if you have a flash memory storage */ |
70 | #define HAVE_FLASH_STORAGE | 70 | #define HAVE_FLASH_STORAGE |
71 | 71 | ||
72 | #define CONFIG_STORAGE STORAGE_NAND | ||
73 | |||
74 | #define CONFIG_NAND NAND_TCC | ||
75 | |||
72 | /* LCD dimensions */ | 76 | /* LCD dimensions */ |
73 | #define LCD_WIDTH 160 | 77 | #define LCD_WIDTH 160 |
74 | #define LCD_HEIGHT 128 | 78 | #define LCD_HEIGHT 128 |
@@ -155,10 +159,6 @@ | |||
155 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 159 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
156 | #define BOOTDIR "/" | 160 | #define BOOTDIR "/" |
157 | 161 | ||
158 | #define CONFIG_STORAGE STORAGE_NAND | ||
159 | |||
160 | #define CONFIG_NAND NAND_TCC | ||
161 | |||
162 | #ifdef BOOTLOADER | 162 | #ifdef BOOTLOADER |
163 | #define TCCBOOT | 163 | #define TCCBOOT |
164 | #endif | 164 | #endif |
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h index 160058ff7f..da5a9e2bae 100644 --- a/firmware/export/config-logikdax.h +++ b/firmware/export/config-logikdax.h | |||
@@ -45,6 +45,10 @@ | |||
45 | /* define this if you have a flash memory storage */ | 45 | /* define this if you have a flash memory storage */ |
46 | #define HAVE_FLASH_STORAGE | 46 | #define HAVE_FLASH_STORAGE |
47 | 47 | ||
48 | #define CONFIG_STORAGE STORAGE_NAND | ||
49 | |||
50 | #define CONFIG_NAND NAND_TCC | ||
51 | |||
48 | /* LCD dimensions */ | 52 | /* LCD dimensions */ |
49 | #define LCD_WIDTH 128 | 53 | #define LCD_WIDTH 128 |
50 | #define LCD_HEIGHT 64 | 54 | #define LCD_HEIGHT 64 |
@@ -139,8 +143,4 @@ | |||
139 | #define ICODE_ATTR_ALAC | 143 | #define ICODE_ATTR_ALAC |
140 | #define IBSS_ATTR_SHORTEN_DECODED0 | 144 | #define IBSS_ATTR_SHORTEN_DECODED0 |
141 | 145 | ||
142 | #define CONFIG_STORAGE STORAGE_NAND | ||
143 | |||
144 | #define CONFIG_NAND NAND_TCC | ||
145 | |||
146 | #endif /* SIMULATOR */ | 146 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h index b3b71ee778..cab1c9927b 100644 --- a/firmware/export/config-m200.h +++ b/firmware/export/config-m200.h | |||
@@ -38,6 +38,10 @@ | |||
38 | /* define this if you have a flash memory storage */ | 38 | /* define this if you have a flash memory storage */ |
39 | #define HAVE_FLASH_STORAGE | 39 | #define HAVE_FLASH_STORAGE |
40 | 40 | ||
41 | #define CONFIG_STORAGE STORAGE_NAND | ||
42 | |||
43 | #define CONFIG_NAND NAND_TCC | ||
44 | |||
41 | /* LCD dimensions */ | 45 | /* LCD dimensions */ |
42 | #define LCD_WIDTH 128 | 46 | #define LCD_WIDTH 128 |
43 | #define LCD_HEIGHT 64 | 47 | #define LCD_HEIGHT 64 |
@@ -124,8 +128,4 @@ | |||
124 | #define ICODE_ATTR_ALAC | 128 | #define ICODE_ATTR_ALAC |
125 | #define IBSS_ATTR_SHORTEN_DECODED0 | 129 | #define IBSS_ATTR_SHORTEN_DECODED0 |
126 | 130 | ||
127 | #define CONFIG_STORAGE STORAGE_NAND | ||
128 | |||
129 | #define CONFIG_NAND NAND_TCC | ||
130 | |||
131 | #endif /* SIMULATOR */ | 131 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/storage.h b/firmware/export/storage.h index 95e42f67f4..8a0219c523 100644 --- a/firmware/export/storage.h +++ b/firmware/export/storage.h | |||
@@ -102,6 +102,7 @@ static inline int storage_soft_reset(void) | |||
102 | } | 102 | } |
103 | static inline int storage_init(void) | 103 | static inline int storage_init(void) |
104 | { | 104 | { |
105 | #ifndef SIMULATOR | ||
105 | #if (CONFIG_STORAGE & STORAGE_ATA) | 106 | #if (CONFIG_STORAGE & STORAGE_ATA) |
106 | return ata_init(); | 107 | return ata_init(); |
107 | #elif (CONFIG_STORAGE & STORAGE_SD) | 108 | #elif (CONFIG_STORAGE & STORAGE_SD) |
@@ -113,6 +114,15 @@ static inline int storage_init(void) | |||
113 | #else | 114 | #else |
114 | #error No storage driver! | 115 | #error No storage driver! |
115 | #endif | 116 | #endif |
117 | #else | ||
118 | return 0; | ||
119 | #endif | ||
120 | } | ||
121 | static inline void storage_close(void) | ||
122 | { | ||
123 | #if (CONFIG_STORAGE & STORAGE_ATA) | ||
124 | ata_close(); | ||
125 | #endif | ||
116 | } | 126 | } |
117 | static inline int storage_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) | 127 | static inline int storage_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) |
118 | { | 128 | { |