sd simplification: get rid of sc_flags, because we're always running on the same hardware

This commit is contained in:
bushing 2009-10-25 03:26:48 -07:00
parent a1de353e6b
commit c53d5f58c7
3 changed files with 2 additions and 9 deletions

5
sdhc.c
View File

@ -431,10 +431,7 @@ sdhc_bus_power(sdmmc_chipset_handle_t sch, u_int32_t ocr)
struct sdhc_host *hp = sch; struct sdhc_host *hp = sch;
u_int8_t vdd; u_int8_t vdd;
/* /* Disable bus power before voltage change. */
* Disable bus power before voltage change.
*/
if (!(hp->sc->sc_flags & SDHC_F_NOPWR0))
HWRITE1(hp, SDHC_POWER_CTL, 0); HWRITE1(hp, SDHC_POWER_CTL, 0);
/* If power is disabled, reset the host and return now. */ /* If power is disabled, reset the host and return now. */

3
sdhc.h
View File

@ -46,7 +46,6 @@ struct sdhc_softc {
struct device sc_dev; struct device sc_dev;
struct sdhc_host sc_host[SDHC_MAX_HOSTS]; struct sdhc_host sc_host[SDHC_MAX_HOSTS];
int sc_nhosts; int sc_nhosts;
u_int sc_flags;
}; };
@ -62,8 +61,6 @@ void sdhc_irq(void);
#ifdef CAN_HAZ_IPC #ifdef CAN_HAZ_IPC
void sdhc_ipc(volatile ipc_request *req); void sdhc_ipc(volatile ipc_request *req);
#endif #endif
/* flag values */
#define SDHC_F_NOPWR0 (1 << 0)
/* Host standard register set */ /* Host standard register set */
#define SDHC_DMA_ADDR 0x00 #define SDHC_DMA_ADDR 0x00

View File

@ -205,7 +205,6 @@ struct sdmmc_softc {
#define SDMMCDEVNAME(sc) ((sc)->sc_dev.dv_xname) #define SDMMCDEVNAME(sc) ((sc)->sc_dev.dv_xname)
sdmmc_chipset_tag_t sct; /* host controller chipset tag */ sdmmc_chipset_tag_t sct; /* host controller chipset tag */
sdmmc_chipset_handle_t sch; /* host controller chipset handle */ sdmmc_chipset_handle_t sch; /* host controller chipset handle */
int sc_flags;
#define SMF_SD_MODE 0x0001 /* host in SD mode (MMC otherwise) */ #define SMF_SD_MODE 0x0001 /* host in SD mode (MMC otherwise) */
#define SMF_IO_MODE 0x0002 /* host in I/O mode (SD mode only) */ #define SMF_IO_MODE 0x0002 /* host in I/O mode (SD mode only) */
#define SMF_MEM_MODE 0x0004 /* host in memory mode (SD or MMC) */ #define SMF_MEM_MODE 0x0004 /* host in memory mode (SD or MMC) */