diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2008-11-09 23:40:21 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2008-11-09 23:40:21 +0000 |
commit | fa748db6ffb7707e3487aba02a16c47900671076 (patch) | |
tree | 154ff7715ed30110369655eea75708923e74d68e /firmware/export | |
parent | 72846cda0ef56571abf8ac300d852bcf9a04c0b2 (diff) | |
download | rockbox-fa748db6ffb7707e3487aba02a16c47900671076.tar.gz rockbox-fa748db6ffb7707e3487aba02a16c47900671076.zip |
sd.h : avoid namespace collision by prefixing defines with SD_
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19055 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/sd.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/firmware/export/sd.h b/firmware/export/sd.h index c3949af466..eb0f065b49 100644 --- a/firmware/export/sd.h +++ b/firmware/export/sd.h | |||
@@ -49,43 +49,43 @@ bool sd_present(IF_MV_NONVOID(int drive)); | |||
49 | long sd_last_disk_activity(void); | 49 | long sd_last_disk_activity(void); |
50 | 50 | ||
51 | /* SD States */ | 51 | /* SD States */ |
52 | #define IDLE 0 | 52 | #define SD_IDLE 0 |
53 | #define READY 1 | 53 | #define SD_READY 1 |
54 | #define IDENT 2 | 54 | #define SD_IDENT 2 |
55 | #define STBY 3 | 55 | #define SD_STBY 3 |
56 | #define TRAN 4 | 56 | #define SD_TRAN 4 |
57 | #define DATA 5 | 57 | #define SD_DATA 5 |
58 | #define RCV 6 | 58 | #define SD_RCV 6 |
59 | #define PRG 7 | 59 | #define SD_PRG 7 |
60 | #define DIS 8 | 60 | #define SD_DIS 8 |
61 | 61 | ||
62 | /* SD Commands */ | 62 | /* SD Commands */ |
63 | #define GO_IDLE_STATE 0 | 63 | #define SD_GO_IDLE_STATE 0 |
64 | #define ALL_SEND_CID 2 | 64 | #define SD_ALL_SEND_CID 2 |
65 | #define SEND_RELATIVE_ADDR 3 | 65 | #define SD_SEND_RELATIVE_ADDR 3 |
66 | #define SET_DSR 4 | 66 | #define SD_SET_DSR 4 |
67 | #define SWITCH_FUNC 6 | 67 | #define SD_SWITCH_FUNC 6 |
68 | #define SELECT_CARD 7 | 68 | #define SD_SELECT_CARD 7 |
69 | #define DESELECT_CARD 7 | 69 | #define SD_DESELECT_CARD 7 |
70 | #define SEND_IF_COND 8 | 70 | #define SD_SEND_IF_COND 8 |
71 | #define SEND_CSD 9 | 71 | #define SD_SEND_CSD 9 |
72 | #define SEND_CID 10 | 72 | #define SD_SEND_CID 10 |
73 | #define STOP_TRANSMISSION 12 | 73 | #define SD_STOP_TRANSMISSION 12 |
74 | #define SEND_STATUS 13 | 74 | #define SD_SEND_STATUS 13 |
75 | #define GO_INACTIVE_STATE 15 | 75 | #define SD_GO_INACTIVE_STATE 15 |
76 | #define SET_BLOCKLEN 16 | 76 | #define SD_SET_BLOCKLEN 16 |
77 | #define READ_SINGLE_BLOCK 17 | 77 | #define SD_READ_SINGLE_BLOCK 17 |
78 | #define READ_MULTIPLE_BLOCK 18 | 78 | #define SD_READ_MULTIPLE_BLOCK 18 |
79 | #define SEND_NUM_WR_BLOCKS 22 | 79 | #define SD_SEND_NUM_WR_BLOCKS 22 |
80 | #define WRITE_BLOCK 24 | 80 | #define SD_WRITE_BLOCK 24 |
81 | #define WRITE_MULTIPLE_BLOCK 25 | 81 | #define SD_WRITE_MULTIPLE_BLOCK 25 |
82 | #define ERASE_WR_BLK_START 32 | 82 | #define SD_ERASE_WR_BLK_START 32 |
83 | #define ERASE_WR_BLK_END 33 | 83 | #define SD_ERASE_WR_BLK_END 33 |
84 | #define ERASE 38 | 84 | #define SD_ERASE 38 |
85 | #define APP_CMD 55 | 85 | #define SD_APP_CMD 55 |
86 | 86 | ||
87 | /* Application Specific commands */ | 87 | /* Application Specific commands */ |
88 | #define SET_BUS_WIDTH 6 | 88 | #define SD_SET_BUS_WIDTH 6 |
89 | #define SD_APP_OP_COND 41 | 89 | #define SD_APP_OP_COND 41 |
90 | 90 | ||
91 | #endif | 91 | #endif |