Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-02-12 15:30:59 +00:00
Code Issues Projects Releases Wiki Activity

Changed the name of the declaration of the default block size. Reduced the OCR reading timeout.

Browse Source
This commit is contained in:
nvt-se 2009-11-07 01:05:23 +00:00
parent 7aac2d90fb
commit 8c040be133
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/msb430/dev/sd.c
View File

@ -211,7 +211,7 @@ sd_initialize(void)
LOCK_SPI(); LOCK_SPI();
for(i = 0; i < 10000; i++) { for(i = 0; i < SD_TRANSACTION_ATTEMPTS; i++) {
LOWER_CS(); LOWER_CS();
send_command(READ_OCR, 0); send_command(READ_OCR, 0);
r = get_response(R3); r = get_response(R3);
@ -235,7 +235,8 @@ sd_initialize(void)
read_bl_len = reg[5] & 0x0f; read_bl_len = reg[5] & 0x0f;
block_size = 1 << read_bl_len; block_size = 1 << read_bl_len;
rw_block_size = (block_size > 512) ? 512 : block_size; rw_block_size = (block_size > SD_DEFAULT_BLOCK_SIZE) ?
SD_DEFAULT_BLOCK_SIZE : block_size;
PRINTF("Found block size %d\n", block_size); PRINTF("Found block size %d\n", block_size);
/* XXX Arbitrary wait time here. Need to investigate why this is needed. */ /* XXX Arbitrary wait time here. Need to investigate why this is needed. */

2
platform/msb430/dev/sd.h
View File

@ -42,7 +42,7 @@
#include "sd-arch.h" #include "sd-arch.h"
#define SD_BLOCK_SIZE 512 #define SD_DEFAULT_BLOCK_SIZE 512
#define SD_REGISTER_SIZE 16 #define SD_REGISTER_SIZE 16
/* API return codes. */ /* API return codes. */