51c51
< * $FreeBSD: head/sys/dev/mmc/mmcreg.h 183542 2008-10-02 07:06:59Z imp $
---
> * $FreeBSD: head/sys/dev/mmc/mmcreg.h 183704 2008-10-08 17:35:41Z mav $
89c89
< /* R7 -- new in sd 2.0 */
---
> #define MMC_RSP_R7 (MMC_RSP_PRESENT | MMC_RSP_CRC)
183a184,188
> #define MMC_SWITCH_FUNC 6
> #define MMC_SWITCH_FUNC_CMDS 0
> #define MMC_SWITCH_FUNC_SET 1
> #define MMC_SWITCH_FUNC_CLR 2
> #define MMC_SWITCH_FUNC_WR 3
186c191,192
< #define MMC_SEND_IF_COND 8
---
> #define MMC_SEND_EXT_CSD 8
> #define SD_SEND_IF_COND 8
192c198
< /* reserved: 14 */
---
> #define MMC_BUSTEST_R 14
193a200
> #define MMC_BUSTEST_W 19
279a287,317
> /*
> * EXT_CSD fields
> */
>
> #define EXT_CSD_BUS_WIDTH 183 /* R/W */
> #define EXT_CSD_HS_TIMING 185 /* R/W */
> #define EXT_CSD_CARD_TYPE 196 /* RO */
> #define EXT_CSD_REV 192 /* RO */
> #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
>
> /*
> * EXT_CSD field definitions
> */
>
> #define EXT_CSD_CMD_SET_NORMAL 1
> #define EXT_CSD_CMD_SET_SECURE 2
> #define EXT_CSD_CMD_SET_CPSECURE 4
>
> #define EXT_CSD_CARD_TYPE_26 1
> #define EXT_CSD_CARD_TYPE_52 2
>
> #define EXT_CSD_BUS_WIDTH_1 0
> #define EXT_CSD_BUS_WIDTH_4 1
> #define EXT_CSD_BUS_WIDTH_8 2
>
> /*
> * SD bus widths
> */
> #define SD_BUS_WIDTH_1 0
> #define SD_BUS_WIDTH_4 2
>
330a369
> uint8_t spec_vers;
353a393,400
> struct mmc_scr
> {
> unsigned char sda_vsn;
> unsigned char bus_widths;
> #define SD_SCR_BUS_WIDTH_1 (1<<0)
> #define SD_SCR_BUS_WIDTH_4 (1<<2)
> };
>