summaryrefslogtreecommitdiff
path: root/firmware/storage.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/storage.c')
-rw-r--r--firmware/storage.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/storage.c b/firmware/storage.c
index 0f78712784..8740e4ebd2 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -83,7 +83,7 @@ static void storage_wait_turn(IF_MD_NONVOID(int drive))
83} 83}
84#endif 84#endif
85 85
86int storage_read_sectors(IF_MD2(int drive,) unsigned long start, int count, 86int storage_read_sectors(IF_MD(int drive,) unsigned long start, int count,
87 void* buf) 87 void* buf)
88{ 88{
89#ifdef HAVE_IO_PRIORITY 89#ifdef HAVE_IO_PRIORITY
@@ -98,38 +98,38 @@ int storage_read_sectors(IF_MD2(int drive,) unsigned long start, int count,
98 { 98 {
99#if (CONFIG_STORAGE & STORAGE_ATA) 99#if (CONFIG_STORAGE & STORAGE_ATA)
100 case STORAGE_ATA: 100 case STORAGE_ATA:
101 return ata_read_sectors(IF_MD2(ldrive,) start,count,buf); 101 return ata_read_sectors(IF_MD(ldrive,) start,count,buf);
102#endif 102#endif
103 103
104#if (CONFIG_STORAGE & STORAGE_MMC) 104#if (CONFIG_STORAGE & STORAGE_MMC)
105 case STORAGE_MMC: 105 case STORAGE_MMC:
106 return mmc_read_sectors(IF_MD2(ldrive,) start,count,buf); 106 return mmc_read_sectors(IF_MD(ldrive,) start,count,buf);
107#endif 107#endif
108 108
109#if (CONFIG_STORAGE & STORAGE_SD) 109#if (CONFIG_STORAGE & STORAGE_SD)
110 case STORAGE_SD: 110 case STORAGE_SD:
111 return sd_read_sectors(IF_MD2(ldrive,) start,count,buf); 111 return sd_read_sectors(IF_MD(ldrive,) start,count,buf);
112#endif 112#endif
113 113
114#if (CONFIG_STORAGE & STORAGE_NAND) 114#if (CONFIG_STORAGE & STORAGE_NAND)
115 case STORAGE_NAND: 115 case STORAGE_NAND:
116 return nand_read_sectors(IF_MD2(ldrive,) start,count,buf); 116 return nand_read_sectors(IF_MD(ldrive,) start,count,buf);
117#endif 117#endif
118 118
119#if (CONFIG_STORAGE & STORAGE_RAMDISK) 119#if (CONFIG_STORAGE & STORAGE_RAMDISK)
120 case STORAGE_RAMDISK: 120 case STORAGE_RAMDISK:
121 return ramdisk_read_sectors(IF_MD2(ldrive,) start,count,buf); 121 return ramdisk_read_sectors(IF_MD(ldrive,) start,count,buf);
122#endif 122#endif
123 } 123 }
124 124
125 return -1; 125 return -1;
126#else /* CONFIG_STORAGE_MULTI */ 126#else /* CONFIG_STORAGE_MULTI */
127 return STORAGE_FUNCTION(read_sectors)(IF_MD2(drive,)start,count,buf); 127 return STORAGE_FUNCTION(read_sectors)(IF_MD(drive,)start,count,buf);
128#endif /* CONFIG_STORAGE_MULTI */ 128#endif /* CONFIG_STORAGE_MULTI */
129 129
130} 130}
131 131
132int storage_write_sectors(IF_MD2(int drive,) unsigned long start, int count, 132int storage_write_sectors(IF_MD(int drive,) unsigned long start, int count,
133 const void* buf) 133 const void* buf)
134{ 134{
135#ifdef HAVE_IO_PRIORITY 135#ifdef HAVE_IO_PRIORITY
@@ -144,33 +144,33 @@ int storage_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
144 { 144 {
145#if (CONFIG_STORAGE & STORAGE_ATA) 145#if (CONFIG_STORAGE & STORAGE_ATA)
146 case STORAGE_ATA: 146 case STORAGE_ATA:
147 return ata_write_sectors(IF_MD2(ldrive,)start,count,buf); 147 return ata_write_sectors(IF_MD(ldrive,)start,count,buf);
148#endif 148#endif
149 149
150#if (CONFIG_STORAGE & STORAGE_MMC) 150#if (CONFIG_STORAGE & STORAGE_MMC)
151 case STORAGE_MMC: 151 case STORAGE_MMC:
152 return mmc_write_sectors(IF_MD2(ldrive,)start,count,buf); 152 return mmc_write_sectors(IF_MD(ldrive,)start,count,buf);
153#endif 153#endif
154 154
155#if (CONFIG_STORAGE & STORAGE_SD) 155#if (CONFIG_STORAGE & STORAGE_SD)
156 case STORAGE_SD: 156 case STORAGE_SD:
157 return sd_write_sectors(IF_MD2(ldrive,)start,count,buf); 157 return sd_write_sectors(IF_MD(ldrive,)start,count,buf);
158#endif 158#endif
159 159
160#if (CONFIG_STORAGE & STORAGE_NAND) 160#if (CONFIG_STORAGE & STORAGE_NAND)
161 case STORAGE_NAND: 161 case STORAGE_NAND:
162 return nand_write_sectors(IF_MD2(ldrive,)start,count,buf); 162 return nand_write_sectors(IF_MD(ldrive,)start,count,buf);
163#endif 163#endif
164 164
165#if (CONFIG_STORAGE & STORAGE_RAMDISK) 165#if (CONFIG_STORAGE & STORAGE_RAMDISK)
166 case STORAGE_RAMDISK: 166 case STORAGE_RAMDISK:
167 return ramdisk_write_sectors(IF_MD2(ldrive,)start,count,buf); 167 return ramdisk_write_sectors(IF_MD(ldrive,)start,count,buf);
168#endif 168#endif
169 } 169 }
170 170
171 return -1; 171 return -1;
172#else /* CONFIG_STORAGE_MULTI */ 172#else /* CONFIG_STORAGE_MULTI */
173 return STORAGE_FUNCTION(write_sectors)(IF_MD2(drive,)start,count,buf); 173 return STORAGE_FUNCTION(write_sectors)(IF_MD(drive,)start,count,buf);
174#endif /* CONFIG_STORAGE_MULTI */ 174#endif /* CONFIG_STORAGE_MULTI */
175} 175}
176 176