Changeset 654 for trunk/softs

Timestamp:

Mar 3, 2014, 6:48:38 PM (11 years ago)

Author:

cfuguet

Message:

Cleaning up reset_ioc.c file and re-establishing
the .SILENT variable in the Makefile

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (1 diff)
• src/reset_ioc.c (modified) (1 diff)

trunk/softs/tsar_boot/Makefile

@@ -140 +140 @@
         $(DU) -D $@ > $@.txt
 
-#.SILENT:
+.SILENT:

trunk/softs/tsar_boot/src/reset_ioc.c

@@ -192 +192 @@
                     unsigned int count )
 {
-    int status;
 #if USE_BDV
-    status = reset_bdv_read(lba, buffer, count);
-#endif
-#if USE_SPI
-    status = reset_spi_read(lba, buffer, count);
-#endif
-#if USE_RDK
-    status = reset_rdk_read(lba, buffer, count);
-#endif
-    return status;
+    return reset_bdv_read(lba, buffer, count);
+#elif USE_SPI
+    return reset_spi_read(lba, buffer, count);
+#elif USE_RDK
+    return reset_rdk_read(lba, buffer, count);
+#else
+#   error "reset_ioc_read() : No supported disk controller chosen"
+#endif
 }