chrissy
/
P8000
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Oliver Lehmann 2012-06-08 10:40:39 +00:00
parent ba5c7198e0
commit e3b3f563e4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
View File

@ -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 * maximum performance with both turned off
* *
*
* #define MMC_PRESET_MULTIBLOCKCOUNT 1 * #define MMC_PRESET_MULTIBLOCKCOUNT 1
* #define SPI_CRC 1 * #define SPI_CRC 1
*/ */
@ -78,7 +79,5 @@
#define MMC_MULTIBLOCK 1 #define MMC_MULTIBLOCK 1
#undef MEASURE_SDCARD_TIME #undef MEASURE_SDCARD_TIME
#define MEASURE_SDCARD_TIME 1
#endif /* CONFIG_H_ */ #endif /* CONFIG_H_ */

7
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.c
View File

@ -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> #include <avr/io.h>
@ -159,7 +159,6 @@ uint16_t crc16 ( const uint8_t *buffer, uint16_t len )
} }
return crc; return crc;
} }
#endif
uint8_t mmc_enable_crc ( uint8_t on_off ) uint8_t mmc_enable_crc ( uint8_t on_off )
{ {
@ -173,6 +172,7 @@ uint8_t mmc_enable_crc ( uint8_t on_off )
} }
return 0; return 0;
} }
#endif
uint8_t mmc_init () uint8_t mmc_init ()
{ {
@ -429,11 +429,12 @@ uint8_t mmc_read_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks
#endif #endif
MMC_Enable(); MMC_Enable();
// wait_till_card_ready();
#ifdef MMC_MULTIBLOCK #ifdef MMC_MULTIBLOCK
#ifdef MMC_PRESET_MULTIBLOCKCOUNT #ifdef MMC_PRESET_MULTIBLOCKCOUNT
wait_till_card_ready();
/* /*
* send CMD55 * send CMD55
*/ */

2
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
View File

@ -18,7 +18,7 @@
#include "uart.h" #include "uart.h"
#ifdef MEASURE_SDCARD_TIME #ifdef MEASURE_SDCARD_TIME
#define BLOCKNO 550000 #define BLOCKNO 150000
extern uint32_t overflow; extern uint32_t overflow;

4
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c
View File

@ -29,7 +29,7 @@
/* /*
* P8000 WDC Emulator * 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) * TODO: - Different Errorcodes in the MMC layer (use defines)
* - errorchecking in several places * - errorchecking in several places
@ -56,7 +56,7 @@
#include "wdc_if_sdcard.h" #include "wdc_if_sdcard.h"
#include "config.h" #include "config.h"
#define DEBUG 1 #define DEBUG 3
void atmega_setup ( void ); void atmega_setup ( void );