summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 10:27:43 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 10:27:43 +0000
commit64fb3e8df30a10163bb3474b6ae0664d59ae80bb (patch)
treec4c833794a605620aebee9c419baaf25d7a97f7f
parent56d972ad572fd270a117858a982b106a3175d8e0 (diff)
downloadrockbox-64fb3e8df30a10163bb3474b6ae0664d59ae80bb.tar.gz
rockbox-64fb3e8df30a10163bb3474b6ae0664d59ae80bb.zip
Fix more tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24154 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--firmware/export/as3525.h2
-rw-r--r--firmware/export/config/ondavx767.h2
-rw-r--r--firmware/export/config/zenvisionm60gb.h2
-rw-r--r--firmware/export/i2c-coldfire.h38
-rw-r--r--firmware/export/lcd.h10
-rw-r--r--firmware/export/mas.h44
-rw-r--r--firmware/export/storage.h226
-rw-r--r--firmware/export/uda1380.h2
-rw-r--r--firmware/export/usb-tcc.h2
-rw-r--r--firmware/export/usb_ch9.h22
10 files changed, 175 insertions, 175 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index d23bc2b0c8..a8903d17ef 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -295,7 +295,7 @@ interface */
295#define UART_LNSTATUS_REG (*(volatile unsigned long*)(UART0_BASE + 0x14)) /* Line status register */ 295#define UART_LNSTATUS_REG (*(volatile unsigned long*)(UART0_BASE + 0x14)) /* Line status register */
296 296
297 297
298#define SD_MCI_POWER (*(volatile unsigned long*)(SD_MCI_BASE + 0x0)) 298#define SD_MCI_POWER (*(volatile unsigned long*)(SD_MCI_BASE + 0x0))
299 299
300 300
301#define TIMER1_LOAD (*(volatile unsigned long*)(TIMER_BASE + 0x00)) /* 32-bit width */ 301#define TIMER1_LOAD (*(volatile unsigned long*)(TIMER_BASE + 0x00)) /* 32-bit width */
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index 661d3e9e5e..9c5248a6a1 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -159,7 +159,7 @@
159#define BOOTFILE "rockbox." BOOTFILE_EXT 159#define BOOTFILE "rockbox." BOOTFILE_EXT
160#define BOOTDIR "/.rockbox" 160#define BOOTDIR "/.rockbox"
161 161
162#define CONFIG_USBOTG USBOTG_JZ4740 162#define CONFIG_USBOTG USBOTG_JZ4740
163#define HAVE_USBSTACK 163#define HAVE_USBSTACK
164#define USE_ROCKBOX_USB 164#define USE_ROCKBOX_USB
165#define USB_VENDOR_ID 0x07C4 165#define USB_VENDOR_ID 0x07C4
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h
index 3e95ae7be7..bdede47962 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
@@ -158,7 +158,7 @@
158#define BOOTFILE "rockbox." BOOTFILE_EXT 158#define BOOTFILE "rockbox." BOOTFILE_EXT
159#define BOOTDIR "/.rockbox" 159#define BOOTDIR "/.rockbox"
160 160
161/* #define CONFIG_USBOTG USBOTG_ISP1761 */ 161/* #define CONFIG_USBOTG USBOTG_ISP1761 */
162#define CONFIG_USBOTG USBOTG_ISP1583 162#define CONFIG_USBOTG USBOTG_ISP1583
163#define HAVE_USBSTACK 163#define HAVE_USBSTACK
164#define USE_ROCKBOX_USB 164#define USE_ROCKBOX_USB
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h
index e5b34ddea6..b0d21a8631 100644
--- a/firmware/export/i2c-coldfire.h
+++ b/firmware/export/i2c-coldfire.h
@@ -44,31 +44,31 @@ void i2c_adjust_prescale(int multiplier);
44#define MAX_LOOP 0x100 /* TODO: select a better value */ 44#define MAX_LOOP 0x100 /* TODO: select a better value */
45 45
46/* PLLCR control */ 46/* PLLCR control */
47#define QSPISEL (1 << 11) /* Selects QSPI or I2C interface */ 47#define QSPISEL (1 << 11) /* Selects QSPI or I2C interface */
48 48
49/* Offsets to I2C registers from base address */ 49/* Offsets to I2C registers from base address */
50#define O_MADR 0x00 /* Slave Address */ 50#define O_MADR 0x00 /* Slave Address */
51#define O_MFDR 0x04 /* Frequency divider */ 51#define O_MFDR 0x04 /* Frequency divider */
52#define O_MBCR 0x08 /* Control register */ 52#define O_MBCR 0x08 /* Control register */
53#define O_MBSR 0x0c /* Status register */ 53#define O_MBSR 0x0c /* Status register */
54#define O_MBDR 0x10 /* Data register */ 54#define O_MBDR 0x10 /* Data register */
55 55
56/* MBSR - Status register */ 56/* MBSR - Status register */
57#define ICF (1 << 7) /* Transfer Complete */ 57#define ICF (1 << 7) /* Transfer Complete */
58#define IAAS (1 << 6) /* Addressed As Alave */ 58#define IAAS (1 << 6) /* Addressed As Alave */
59#define IBB (1 << 5) /* Bus Busy */ 59#define IBB (1 << 5) /* Bus Busy */
60#define IAL (1 << 4) /* Arbitration Lost */ 60#define IAL (1 << 4) /* Arbitration Lost */
61#define SRW (1 << 2) /* Slave R/W */ 61#define SRW (1 << 2) /* Slave R/W */
62#define IIF (1 << 1) /* I2C Interrupt */ 62#define IIF (1 << 1) /* I2C Interrupt */
63#define RXAK (1 << 0) /* No Ack bit */ 63#define RXAK (1 << 0) /* No Ack bit */
64 64
65/* MBCR - Control register */ 65/* MBCR - Control register */
66#define IEN (1 << 7) /* I2C Enable */ 66#define IEN (1 << 7) /* I2C Enable */
67#define IIEN (1 << 6) /* Interrupt Enable */ 67#define IIEN (1 << 6) /* Interrupt Enable */
68#define MSTA (1 << 5) /* Master/Slave select */ 68#define MSTA (1 << 5) /* Master/Slave select */
69#define MTX (1 << 4) /* Transmit/Receive */ 69#define MTX (1 << 4) /* Transmit/Receive */
70#define TXAK (1 << 3) /* Transfer ACK */ 70#define TXAK (1 << 3) /* Transfer ACK */
71#define RSTA (1 << 2) /* Restart.. */ 71#define RSTA (1 << 2) /* Restart.. */
72 72
73 73
74#endif 74#endif
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 89f39437a0..5145e7c21a 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -159,13 +159,13 @@ typedef unsigned char fb_data;
159#if defined(HAVE_LCD_MODES) 159#if defined(HAVE_LCD_MODES)
160void lcd_set_mode(int mode); 160void lcd_set_mode(int mode);
161#define LCD_MODE_RGB565 0x00000001 161#define LCD_MODE_RGB565 0x00000001
162#define LCD_MODE_YUV 0x00000002 162#define LCD_MODE_YUV 0x00000002
163#define LCD_MODE_PAL256 0x00000004 163#define LCD_MODE_PAL256 0x00000004
164 164
165#if HAVE_LCD_MODES & LCD_MODE_PAL256 165#if HAVE_LCD_MODES & LCD_MODE_PAL256
166 void lcd_blit_pal256(unsigned char *src, int src_x, int src_y, int x, int y, 166 void lcd_blit_pal256(unsigned char *src, int src_x, int src_y, int x, int y,
167 int width, int height); 167 int width, int height);
168 void lcd_pal256_update_pal(fb_data *palette); 168 void lcd_pal256_update_pal(fb_data *palette);
169#endif 169#endif
170#endif 170#endif
171 171
diff --git a/firmware/export/mas.h b/firmware/export/mas.h
index 3cc9d3a34c..9cbe970b94 100644
--- a/firmware/export/mas.h
+++ b/firmware/export/mas.h
@@ -27,43 +27,43 @@
27#define MAX_PEAK 0x8000 27#define MAX_PEAK 0x8000
28 28
29/* 29/*
30 MAS I2C defs 30 MAS I2C defs
31*/ 31*/
32#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 32#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
33#define MAS_ADR 0x3c 33#define MAS_ADR 0x3c
34#define MAS_DEV_WRITE (MAS_ADR | 0x00) 34#define MAS_DEV_WRITE (MAS_ADR | 0x00)
35#define MAS_DEV_READ (MAS_ADR | 0x01) 35#define MAS_DEV_READ (MAS_ADR | 0x01)
36 36
37#elif CONFIG_CODEC == MAS3507D 37#elif CONFIG_CODEC == MAS3507D
38#define MAS_ADR 0x3a 38#define MAS_ADR 0x3a
39#define MAS_DEV_WRITE (MAS_ADR | 0x00) 39#define MAS_DEV_WRITE (MAS_ADR | 0x00)
40#define MAS_DEV_READ (MAS_ADR | 0x01) 40#define MAS_DEV_READ (MAS_ADR | 0x01)
41#endif 41#endif
42 42
43/* registers..*/ 43/* registers..*/
44#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 44#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
45#define MAS_DATA_WRITE 0x68 45#define MAS_DATA_WRITE 0x68
46#define MAS_DATA_READ 0x69 46#define MAS_DATA_READ 0x69
47#define MAS_CODEC_WRITE 0x6c 47#define MAS_CODEC_WRITE 0x6c
48#define MAS_CODEC_READ 0x6d 48#define MAS_CODEC_READ 0x6d
49#define MAS_CONTROL 0x6a 49#define MAS_CONTROL 0x6a
50#define MAS_DCCF 0x76 50#define MAS_DCCF 0x76
51#define MAS_DCFR 0x77 51#define MAS_DCFR 0x77
52 52
53#elif CONFIG_CODEC == MAS3507D 53#elif CONFIG_CODEC == MAS3507D
54#define MAS_DATA_WRITE 0x68 54#define MAS_DATA_WRITE 0x68
55#define MAS_DATA_READ 0x69 55#define MAS_DATA_READ 0x69
56#define MAS_CONTROL 0x6a 56#define MAS_CONTROL 0x6a
57#endif 57#endif
58 58
59/* 59/*
60 * MAS register 60 * MAS register
61 */ 61 */
62#define MAS_REG_DCCF 0x8e 62#define MAS_REG_DCCF 0x8e
63#define MAS_REG_MUTE 0xaa 63#define MAS_REG_MUTE 0xaa
64#define MAS_REG_PIODATA 0xc8 64#define MAS_REG_PIODATA 0xc8
65#define MAS_REG_StartUpConfig 0xe6 65#define MAS_REG_StartUpConfig 0xe6
66#define MAS_REG_KPRESCALE 0xe7 66#define MAS_REG_KPRESCALE 0xe7
67#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 67#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
68#define MAS_REG_KMDB_SWITCH 0x21 68#define MAS_REG_KMDB_SWITCH 0x21
69#define MAS_REG_KMDB_STR 0x22 69#define MAS_REG_KMDB_STR 0x22
@@ -77,12 +77,12 @@
77#define MAS_REG_VOLUME_CONTROL 0x10 77#define MAS_REG_VOLUME_CONTROL 0x10
78#define MAS_REG_BALANCE 0x11 78#define MAS_REG_BALANCE 0x11
79#define MAS_REG_KAVC 0x12 79#define MAS_REG_KAVC 0x12
80#define MAS_REG_KBASS 0x14 80#define MAS_REG_KBASS 0x14
81#define MAS_REG_KTREBLE 0x15 81#define MAS_REG_KTREBLE 0x15
82 82
83#elif CONFIG_CODEC == MAS3507D 83#elif CONFIG_CODEC == MAS3507D
84#define MAS_REG_KBASS 0x6b 84#define MAS_REG_KBASS 0x6b
85#define MAS_REG_KTREBLE 0x6f 85#define MAS_REG_KTREBLE 0x6f
86#endif 86#endif
87 87
88/* 88/*
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index cb4ad7fc3a..0096e87a8d 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -56,140 +56,140 @@ struct storage_info
56 * pointers, which doesn't work with argument-macros. 56 * pointers, which doesn't work with argument-macros.
57 */ 57 */
58 #define storage_num_drives() NUM_DRIVES 58 #define storage_num_drives() NUM_DRIVES
59 #if (CONFIG_STORAGE & STORAGE_ATA) 59 #if (CONFIG_STORAGE & STORAGE_ATA)
60 #define storage_spindown ata_spindown 60 #define storage_spindown ata_spindown
61 #define storage_sleep ata_sleep 61 #define storage_sleep ata_sleep
62 #define storage_spin ata_spin 62 #define storage_spin ata_spin
63 63
64 #define storage_enable(on) ata_enable(on) 64 #define storage_enable(on) ata_enable(on)
65 #define storage_sleepnow() ata_sleepnow() 65 #define storage_sleepnow() ata_sleepnow()
66 #define storage_disk_is_active() ata_disk_is_active() 66 #define storage_disk_is_active() ata_disk_is_active()
67 #define storage_soft_reset() ata_soft_reset() 67 #define storage_soft_reset() ata_soft_reset()
68 #define storage_init() ata_init() 68 #define storage_init() ata_init()
69 #define storage_close() ata_close() 69 #define storage_close() ata_close()
70 #define storage_read_sectors(drive, start, count, buf) ata_read_sectors(IF_MD2(drive,) start, count, buf) 70 #define storage_read_sectors(drive, start, count, buf) ata_read_sectors(IF_MD2(drive,) start, count, buf)
71 #define storage_write_sectors(drive, start, count, buf) ata_write_sectors(IF_MD2(drive,) start, count, buf) 71 #define storage_write_sectors(drive, start, count, buf) ata_write_sectors(IF_MD2(drive,) start, count, buf)
72 #ifdef HAVE_STORAGE_FLUSH 72 #ifdef HAVE_STORAGE_FLUSH
73 #define storage_flush() (void)0 73 #define storage_flush() (void)0
74 #endif 74 #endif
75 #define storage_last_disk_activity() ata_last_disk_activity() 75 #define storage_last_disk_activity() ata_last_disk_activity()
76 #define storage_spinup_time() ata_spinup_time() 76 #define storage_spinup_time() ata_spinup_time()
77 #define storage_get_identify() ata_get_identify() 77 #define storage_get_identify() ata_get_identify()
78 78
79 #ifdef STORAGE_GET_INFO 79 #ifdef STORAGE_GET_INFO
80 #define storage_get_info(drive, info) ata_get_info(IF_MD2(drive,) info) 80 #define storage_get_info(drive, info) ata_get_info(IF_MD2(drive,) info)
81 #endif 81 #endif
82 #ifdef HAVE_HOTSWAP 82 #ifdef HAVE_HOTSWAP
83 #define storage_removable(drive) ata_removable(IF_MD(drive)) 83 #define storage_removable(drive) ata_removable(IF_MD(drive))
84 #define storage_present(drive) ata_present(IF_MD(drive)) 84 #define storage_present(drive) ata_present(IF_MD(drive))
85 #endif 85 #endif
86 #elif (CONFIG_STORAGE & STORAGE_SD) 86 #elif (CONFIG_STORAGE & STORAGE_SD)
87 #define storage_spindown sd_spindown 87 #define storage_spindown sd_spindown
88 #define storage_sleep sd_sleep 88 #define storage_sleep sd_sleep
89 #define storage_spin sd_spin 89 #define storage_spin sd_spin
90 90
91 #define storage_enable(on) sd_enable(on) 91 #define storage_enable(on) sd_enable(on)
92 #define storage_sleepnow() sd_sleepnow() 92 #define storage_sleepnow() sd_sleepnow()
93 #define storage_disk_is_active() 0 93 #define storage_disk_is_active() 0
94 #define storage_soft_reset() (void)0 94 #define storage_soft_reset() (void)0
95 #define storage_init() sd_init() 95 #define storage_init() sd_init()
96 #define storage_read_sectors(drive, start, count, buf) sd_read_sectors(IF_MD2(drive,) start, count, buf) 96 #define storage_read_sectors(drive, start, count, buf) sd_read_sectors(IF_MD2(drive,) start, count, buf)
97 #define storage_write_sectors(drive, start, count, buf) sd_write_sectors(IF_MD2(drive,) start, count, buf) 97 #define storage_write_sectors(drive, start, count, buf) sd_write_sectors(IF_MD2(drive,) start, count, buf)
98 #ifdef HAVE_STORAGE_FLUSH 98 #ifdef HAVE_STORAGE_FLUSH
99 #define storage_flush() (void)0 99 #define storage_flush() (void)0
100 #endif 100 #endif
101 #define storage_last_disk_activity() sd_last_disk_activity() 101 #define storage_last_disk_activity() sd_last_disk_activity()
102 #define storage_spinup_time() 0 102 #define storage_spinup_time() 0
103 #define storage_get_identify() sd_get_identify() 103 #define storage_get_identify() sd_get_identify()
104 104
105 #ifdef STORAGE_GET_INFO 105 #ifdef STORAGE_GET_INFO
106 #define storage_get_info(drive, info) sd_get_info(IF_MD2(drive,) info) 106 #define storage_get_info(drive, info) sd_get_info(IF_MD2(drive,) info)
107 #endif 107 #endif
108 #ifdef HAVE_HOTSWAP 108 #ifdef HAVE_HOTSWAP
109 #define storage_removable(drive) sd_removable(IF_MD(drive)) 109 #define storage_removable(drive) sd_removable(IF_MD(drive))
110 #define storage_present(drive) sd_present(IF_MD(drive)) 110 #define storage_present(drive) sd_present(IF_MD(drive))
111 #endif 111 #endif
112 #elif (CONFIG_STORAGE & STORAGE_MMC) 112 #elif (CONFIG_STORAGE & STORAGE_MMC)
113 #define storage_spindown mmc_spindown 113 #define storage_spindown mmc_spindown
114 #define storage_sleep mmc_sleep 114 #define storage_sleep mmc_sleep
115 #define storage_spin mmc_spin 115 #define storage_spin mmc_spin
116 116
117 #define storage_enable(on) mmc_enable(on) 117 #define storage_enable(on) mmc_enable(on)
118 #define storage_sleepnow() mmc_sleepnow() 118 #define storage_sleepnow() mmc_sleepnow()
119 #define storage_disk_is_active() mmc_disk_is_active() 119 #define storage_disk_is_active() mmc_disk_is_active()
120 #define storage_soft_reset() (void)0 120 #define storage_soft_reset() (void)0
121 #define storage_init() mmc_init() 121 #define storage_init() mmc_init()
122 #define storage_read_sectors(drive, start, count, buf) mmc_read_sectors(IF_MD2(drive,) start, count, buf) 122 #define storage_read_sectors(drive, start, count, buf) mmc_read_sectors(IF_MD2(drive,) start, count, buf)
123 #define storage_write_sectors(drive, start, count, buf) mmc_write_sectors(IF_MD2(drive,) start, count, buf) 123 #define storage_write_sectors(drive, start, count, buf) mmc_write_sectors(IF_MD2(drive,) start, count, buf)
124 #ifdef HAVE_STORAGE_FLUSH 124 #ifdef HAVE_STORAGE_FLUSH
125 #define storage_flush() (void)0 125 #define storage_flush() (void)0
126 #endif 126 #endif
127 #define storage_last_disk_activity() mmc_last_disk_activity() 127 #define storage_last_disk_activity() mmc_last_disk_activity()
128 #define storage_spinup_time() 0 128 #define storage_spinup_time() 0
129 #define storage_get_identify() mmc_get_identify() 129 #define storage_get_identify() mmc_get_identify()
130 130
131 #ifdef STORAGE_GET_INFO 131 #ifdef STORAGE_GET_INFO
132 #define storage_get_info(drive, info) mmc_get_info(IF_MD2(drive,) info) 132 #define storage_get_info(drive, info) mmc_get_info(IF_MD2(drive,) info)
133 #endif 133 #endif
134 #ifdef HAVE_HOTSWAP 134 #ifdef HAVE_HOTSWAP
135 #define storage_removable(drive) mmc_removable(IF_MD(drive)) 135 #define storage_removable(drive) mmc_removable(IF_MD(drive))
136 #define storage_present(drive) mmc_present(IF_MD(drive)) 136 #define storage_present(drive) mmc_present(IF_MD(drive))
137 #endif 137 #endif
138 #elif (CONFIG_STORAGE & STORAGE_NAND) 138 #elif (CONFIG_STORAGE & STORAGE_NAND)
139 #define storage_spindown nand_spindown 139 #define storage_spindown nand_spindown
140 #define storage_sleep nand_sleep 140 #define storage_sleep nand_sleep
141 #define storage_spin nand_spin 141 #define storage_spin nand_spin
142 142
143 #define storage_enable(on) (void)0 143 #define storage_enable(on) (void)0
144 #define storage_sleepnow() nand_sleepnow() 144 #define storage_sleepnow() nand_sleepnow()
145 #define storage_disk_is_active() 0 145 #define storage_disk_is_active() 0
146 #define storage_soft_reset() (void)0 146 #define storage_soft_reset() (void)0
147 #define storage_init() nand_init() 147 #define storage_init() nand_init()
148 #define storage_read_sectors(drive, start, count, buf) nand_read_sectors(IF_MD2(drive,) start, count, buf) 148 #define storage_read_sectors(drive, start, count, buf) nand_read_sectors(IF_MD2(drive,) start, count, buf)
149 #define storage_write_sectors(drive, start, count, buf) nand_write_sectors(IF_MD2(drive,) start, count, buf) 149 #define storage_write_sectors(drive, start, count, buf) nand_write_sectors(IF_MD2(drive,) start, count, buf)
150 #ifdef HAVE_STORAGE_FLUSH 150 #ifdef HAVE_STORAGE_FLUSH
151 #define storage_flush() nand_flush() 151 #define storage_flush() nand_flush()
152 #endif
153 #define storage_last_disk_activity() nand_last_disk_activity()
154 #define storage_spinup_time() 0
155 #define storage_get_identify() nand_get_identify()
156
157 #ifdef STORAGE_GET_INFO
158 #define storage_get_info(drive, info) nand_get_info(IF_MD2(drive,) info)
159 #endif
160 #ifdef HAVE_HOTSWAP
161 #define storage_removable(drive) nand_removable(IF_MD(drive))
162 #define storage_present(drive) nand_present(IF_MD(drive))
152 #endif 163 #endif
153 #define storage_last_disk_activity() nand_last_disk_activity() 164 #elif (CONFIG_STORAGE & STORAGE_RAMDISK)
154 #define storage_spinup_time() 0 165 #define storage_spindown ramdisk_spindown
155 #define storage_get_identify() nand_get_identify() 166 #define storage_sleep ramdisk_sleep
156 167 #define storage_spin ramdisk_spin
157 #ifdef STORAGE_GET_INFO
158 #define storage_get_info(drive, info) nand_get_info(IF_MD2(drive,) info)
159 #endif
160 #ifdef HAVE_HOTSWAP
161 #define storage_removable(drive) nand_removable(IF_MD(drive))
162 #define storage_present(drive) nand_present(IF_MD(drive))
163 #endif
164 #elif (CONFIG_STORAGE & STORAGE_RAMDISK)
165 #define storage_spindown ramdisk_spindown
166 #define storage_sleep ramdisk_sleep
167 #define storage_spin ramdisk_spin
168 168
169 #define storage_enable(on) (void)0 169 #define storage_enable(on) (void)0
170 #define storage_sleepnow() ramdisk_sleepnow() 170 #define storage_sleepnow() ramdisk_sleepnow()
171 #define storage_disk_is_active() 0 171 #define storage_disk_is_active() 0
172 #define storage_soft_reset() (void)0 172 #define storage_soft_reset() (void)0
173 #define storage_init() ramdisk_init() 173 #define storage_init() ramdisk_init()
174 #define storage_read_sectors(drive, start, count, buf) ramdisk_read_sectors(IF_MD2(drive,) start, count, buf) 174 #define storage_read_sectors(drive, start, count, buf) ramdisk_read_sectors(IF_MD2(drive,) start, count, buf)
175 #define storage_write_sectors(drive, start, count, buf) ramdisk_write_sectors(IF_MD2(drive,) start, count, buf) 175 #define storage_write_sectors(drive, start, count, buf) ramdisk_write_sectors(IF_MD2(drive,) start, count, buf)
176 #ifdef HAVE_STORAGE_FLUSH 176 #ifdef HAVE_STORAGE_FLUSH
177 #define storage_flush() (void)0 177 #define storage_flush() (void)0
178 #endif 178 #endif
179 #define storage_last_disk_activity() ramdisk_last_disk_activity() 179 #define storage_last_disk_activity() ramdisk_last_disk_activity()
180 #define storage_spinup_time() 0 180 #define storage_spinup_time() 0
181 #define storage_get_identify() ramdisk_get_identify() 181 #define storage_get_identify() ramdisk_get_identify()
182 182
183 #ifdef STORAGE_GET_INFO 183 #ifdef STORAGE_GET_INFO
184 #define storage_get_info(drive, info) ramdisk_get_info(IF_MD2(drive,) info) 184 #define storage_get_info(drive, info) ramdisk_get_info(IF_MD2(drive,) info)
185 #endif 185 #endif
186 #ifdef HAVE_HOTSWAP 186 #ifdef HAVE_HOTSWAP
187 #define storage_removable(drive) ramdisk_removable(IF_MD(drive)) 187 #define storage_removable(drive) ramdisk_removable(IF_MD(drive))
188 #define storage_present(drive) ramdisk_present(IF_MD(drive)) 188 #define storage_present(drive) ramdisk_present(IF_MD(drive))
189 #endif 189 #endif
190 #else 190 #else
191 //#error No storage driver! 191 //#error No storage driver!
192 #endif 192 #endif
193#else /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/ 193#else /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/
194 194
195/* Simulator and multi-driver use normal functions */ 195/* Simulator and multi-driver use normal functions */
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index 6858f51e3c..e9292cf466 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -59,7 +59,7 @@ extern void audiohw_set_mixer_vol(int channel1, int channel2);
59 59
60 60
61/* REG_I2S: I2S settings */ 61/* REG_I2S: I2S settings */
62#define REG_I2S 0x01 62#define REG_I2S 0x01
63#define I2S_IFMT_IIS (0 << 8) 63#define I2S_IFMT_IIS (0 << 8)
64#define I2S_IFMT_LSB16 (1 << 8) 64#define I2S_IFMT_LSB16 (1 << 8)
65#define I2S_IFMT_LSB18 (2 << 8) 65#define I2S_IFMT_LSB18 (2 << 8)
diff --git a/firmware/export/usb-tcc.h b/firmware/export/usb-tcc.h
index 787977312f..c3932c7164 100644
--- a/firmware/export/usb-tcc.h
+++ b/firmware/export/usb-tcc.h
@@ -112,5 +112,5 @@
112#define TCC7xx_USB_EP_DMA_ADDR1 MMR_REG16(USB_BASE, 0xa0) /* EP DMA MCU addr1 register */ 112#define TCC7xx_USB_EP_DMA_ADDR1 MMR_REG16(USB_BASE, 0xa0) /* EP DMA MCU addr1 register */
113#define TCC7xx_USB_EP_DMA_ADDR2 MMR_REG16(USB_BASE, 0xa4) /* EP DMA MCU addr2 register */ 113#define TCC7xx_USB_EP_DMA_ADDR2 MMR_REG16(USB_BASE, 0xa4) /* EP DMA MCU addr2 register */
114#define TCC7xx_USB_EP_DMA_STAT MMR_REG16(USB_BASE, 0xc0) /* EP DMA Transfer Status register */ 114#define TCC7xx_USB_EP_DMA_STAT MMR_REG16(USB_BASE, 0xc0) /* EP DMA Transfer Status register */
115#define TCC7xx_USB_DELAY_CTRL MMR_REG16(USB_BASE, 0x80) /* Delay control register */ 115#define TCC7xx_USB_DELAY_CTRL MMR_REG16(USB_BASE, 0x80) /* Delay control register */
116#endif /* USB_TCC7XX_H */ 116#endif /* USB_TCC7XX_H */
diff --git a/firmware/export/usb_ch9.h b/firmware/export/usb_ch9.h
index f05dbd3265..c11775b893 100644
--- a/firmware/export/usb_ch9.h
+++ b/firmware/export/usb_ch9.h
@@ -115,17 +115,17 @@
115 * are at most sixteen features of each type.) Hubs may also support a 115 * are at most sixteen features of each type.) Hubs may also support a
116 * new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend. 116 * new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend.
117 */ 117 */
118#define USB_DEVICE_SELF_POWERED 0 /* (read only) */ 118#define USB_DEVICE_SELF_POWERED 0 /* (read only) */
119#define USB_DEVICE_REMOTE_WAKEUP 1 /* dev may initiate wakeup */ 119#define USB_DEVICE_REMOTE_WAKEUP 1 /* dev may initiate wakeup */
120#define USB_DEVICE_TEST_MODE 2 /* (wired high speed only) */ 120#define USB_DEVICE_TEST_MODE 2 /* (wired high speed only) */
121#define USB_DEVICE_BATTERY 2 /* (wireless) */ 121#define USB_DEVICE_BATTERY 2 /* (wireless) */
122#define USB_DEVICE_B_HNP_ENABLE 3 /* (otg) dev may initiate HNP */ 122#define USB_DEVICE_B_HNP_ENABLE 3 /* (otg) dev may initiate HNP */
123#define USB_DEVICE_WUSB_DEVICE 3 /* (wireless)*/ 123#define USB_DEVICE_WUSB_DEVICE 3 /* (wireless)*/
124#define USB_DEVICE_A_HNP_SUPPORT 4 /* (otg) RH port supports HNP */ 124#define USB_DEVICE_A_HNP_SUPPORT 4 /* (otg) RH port supports HNP */
125#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */ 125#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */
126#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ 126#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */
127 127
128#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ 128#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */
129 129
130 130
131/** 131/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-22 18:42:26 +0000