From e3b3f563e4fed0b411d6777b154ece4e4d029b69 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <lehmann@ans-netz.de>
Date: Fri, 8 Jun 2012 10:40:39 +0000
Subject: [PATCH] update

---
 P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h       | 5 ++---
 P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c      | 7 ++++---
 P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c | 2 +-
 P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c         | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
index 96dab9b..e2f0cff 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_config.h,v 1.9 2012/06/07 20:25:46 olivleh1 Exp $
+ * $Id: wdc_config.h,v 1.10 2012/06/08 10:40:39 olivleh1 Exp $
  */
 
 
@@ -71,6 +71,7 @@
 /*
  * maximum performance with both turned off
  *
+ *
  * #define MMC_PRESET_MULTIBLOCKCOUNT 1
  * #define SPI_CRC       1
  */
@@ -78,7 +79,5 @@
 #define MMC_MULTIBLOCK 1
 
 #undef  MEASURE_SDCARD_TIME
-#define MEASURE_SDCARD_TIME 1
-
 
 #endif /* CONFIG_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c
index 5e3da21..1e791c1 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_drv_mmc.c,v 1.12 2012/06/07 20:25:46 olivleh1 Exp $
+ * $Id: wdc_drv_mmc.c,v 1.13 2012/06/08 10:40:39 olivleh1 Exp $
  */
 
 #include <avr/io.h>
@@ -159,7 +159,6 @@ uint16_t crc16 ( const uint8_t *buffer, uint16_t len )
     }
     return crc;
 }
-#endif
 
 uint8_t mmc_enable_crc ( uint8_t on_off )
 {
@@ -173,6 +172,7 @@ uint8_t mmc_enable_crc ( uint8_t on_off )
     }
     return 0;
 }
+#endif
 
 uint8_t mmc_init ()
 {
@@ -429,11 +429,12 @@ uint8_t mmc_read_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks
 #endif
 
     MMC_Enable();
-//    wait_till_card_ready();
 
 #ifdef MMC_MULTIBLOCK
 #ifdef MMC_PRESET_MULTIBLOCKCOUNT
 
+    wait_till_card_ready();
+
     /*
      * send CMD55
      */
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
index 9458333..f8fd026 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
@@ -18,7 +18,7 @@
 #include "uart.h"
 
 #ifdef MEASURE_SDCARD_TIME
-#define BLOCKNO 550000
+#define BLOCKNO 150000
 
 extern  uint32_t overflow;
 
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c
index 3842daf..6a07554 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c
@@ -29,7 +29,7 @@
 /*
  * P8000 WDC Emulator
  *
- * $Id: wdc_main.c,v 1.20 2012/06/07 20:25:46 olivleh1 Exp $
+ * $Id: wdc_main.c,v 1.21 2012/06/08 10:40:39 olivleh1 Exp $
  *
  * TODO: - Different Errorcodes in the MMC layer (use defines)
  *       - errorchecking in several places
@@ -56,7 +56,7 @@
 #include "wdc_if_sdcard.h"
 #include "config.h"
 
-#define DEBUG 1
+#define DEBUG 3
 
 void atmega_setup ( void );