diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mmc/host/dwmmc.c | 2 | ||||
| -rw-r--r-- | sys/dev/sdhci/sdhci.c | 28 |
2 files changed, 2 insertions, 28 deletions
diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index 207fe6f609a5..674c0d441b40 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -67,8 +67,6 @@ __FBSDID("$FreeBSD$"); #include <dev/mmc/host/dwmmc_reg.h> #include <dev/mmc/host/dwmmc_var.h> -#include "opt_mmccam.h" - #include "mmcbr_if.h" #define dprintf(x, arg...) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index d6537a2fd3bf..b1c191a35231 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -2586,33 +2586,9 @@ sdhci_cam_action(struct cam_sim *sim, union ccb *ccb) switch (ccb->ccb_h.func_code) { case XPT_PATH_INQ: - { - struct ccb_pathinq *cpi; - - cpi = &ccb->cpi; - cpi->version_num = 1; - cpi->hba_inquiry = 0; - cpi->target_sprt = 0; - cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN; - cpi->hba_eng_cnt = 0; - cpi->max_target = 0; - cpi->max_lun = 0; - cpi->initiator_id = 1; - cpi->maxio = MAXPHYS; - strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); - strncpy(cpi->hba_vid, "Deglitch Networks", HBA_IDLEN); - strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); - cpi->unit_number = cam_sim_unit(sim); - cpi->bus_id = cam_sim_bus(sim); - cpi->base_transfer_speed = 100; /* XXX WTF? */ - cpi->protocol = PROTO_MMCSD; - cpi->protocol_version = SCSI_REV_0; - cpi->transport = XPORT_MMCSD; - cpi->transport_version = 0; - - cpi->ccb_h.status = CAM_REQ_CMP; + mmc_path_inq(&ccb->cpi, "Deglitch Networks", sim, MAXPHYS); break; - } + case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; |