d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix read_ivar implementation for MMC and SD.

Browse Source 
1. Both mmc_read_ivar() and sdhci_read_ivar() use the expression
'*(int *)result = val' to assign to result which is uintptr_t *.
This does not work on big-endian 64 bit systems.

2. The media_size ivar is declared as 'off_t' which does not fit
into uintptr_t in 32bit systems, change this to long.

Submitted by:	kanthms at netlogicmicro com (initial version)
This commit is contained in:
Jayachandran C. 2011-05-30 06:23:51 +00:00
parent d832ded1a1
commit bcd91d25da
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/mmc/mmc.c
View File

@ -1445,37 +1445,37 @@ mmc_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
default:
return (EINVAL);
case MMC_IVAR_DSR_IMP:
*(int *)result = ivar->csd.dsr_imp;
*result = ivar->csd.dsr_imp;
break;
case MMC_IVAR_MEDIA_SIZE:
*(off_t *)result = ivar->sec_count;
*result = ivar->sec_count;
break;
case MMC_IVAR_RCA:
*(int *)result = ivar->rca;
*result = ivar->rca;
break;
case MMC_IVAR_SECTOR_SIZE:
*(int *)result = MMC_SECTOR_SIZE;
*result = MMC_SECTOR_SIZE;
break;
case MMC_IVAR_TRAN_SPEED:
*(int *)result = mmcbr_get_clock(bus);
*result = mmcbr_get_clock(bus);
break;
case MMC_IVAR_READ_ONLY:
*(int *)result = ivar->read_only;
*result = ivar->read_only;
break;
case MMC_IVAR_HIGH_CAP:
*(int *)result = ivar->high_cap;
*result = ivar->high_cap;
break;
case MMC_IVAR_CARD_TYPE:
*(int *)result = ivar->mode;
*result = ivar->mode;
break;
case MMC_IVAR_BUS_WIDTH:
*(int *)result = ivar->bus_width;
*result = ivar->bus_width;
break;
case MMC_IVAR_ERASE_SECTOR:
*(int *)result = ivar->erase_sector;
*result = ivar->erase_sector;
break;
case MMC_IVAR_MAX_DATA:
*(int *)result = mmcbr_get_max_data(bus);
*result = mmcbr_get_max_data(bus);
break;
}
return (0);

2
sys/dev/mmc/mmcvar.h
View File

@ -79,7 +79,7 @@ enum mmc_device_ivars {
__BUS_ACCESSOR(mmc, var, MMC, ivar, type)
MMC_ACCESSOR(dsr_imp, DSR_IMP, int)
MMC_ACCESSOR(media_size, MEDIA_SIZE, off_t)
MMC_ACCESSOR(media_size, MEDIA_SIZE, long)
MMC_ACCESSOR(rca, RCA, int)
MMC_ACCESSOR(sector_size, SECTOR_SIZE, int)
MMC_ACCESSOR(tran_speed, TRAN_SPEED, int)

28
sys/dev/sdhci/sdhci.c
View File

@ -1443,46 +1443,46 @@ sdhci_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
default:
return (EINVAL);
case MMCBR_IVAR_BUS_MODE:
*(int *)result = slot->host.ios.bus_mode;
*result = slot->host.ios.bus_mode;
break;
case MMCBR_IVAR_BUS_WIDTH:
*(int *)result = slot->host.ios.bus_width;
*result = slot->host.ios.bus_width;
break;
case MMCBR_IVAR_CHIP_SELECT:
*(int *)result = slot->host.ios.chip_select;
*result = slot->host.ios.chip_select;
break;
case MMCBR_IVAR_CLOCK:
*(int *)result = slot->host.ios.clock;
*result = slot->host.ios.clock;
break;
case MMCBR_IVAR_F_MIN:
*(int *)result = slot->host.f_min;
*result = slot->host.f_min;
break;
case MMCBR_IVAR_F_MAX:
*(int *)result = slot->host.f_max;
*result = slot->host.f_max;
break;
case MMCBR_IVAR_HOST_OCR:
*(int *)result = slot->host.host_ocr;
*result = slot->host.host_ocr;
break;
case MMCBR_IVAR_MODE:
*(int *)result = slot->host.mode;
*result = slot->host.mode;
break;
case MMCBR_IVAR_OCR:
*(int *)result = slot->host.ocr;
*result = slot->host.ocr;
break;
case MMCBR_IVAR_POWER_MODE:
*(int *)result = slot->host.ios.power_mode;
*result = slot->host.ios.power_mode;
break;
case MMCBR_IVAR_VDD:
*(int *)result = slot->host.ios.vdd;
*result = slot->host.ios.vdd;
break;
case MMCBR_IVAR_CAPS:
*(int *)result = slot->host.caps;
*result = slot->host.caps;
break;
case MMCBR_IVAR_TIMING:
*(int *)result = slot->host.ios.timing;
*result = slot->host.ios.timing;
break;
case MMCBR_IVAR_MAX_DATA:
*(int *)result = 65535;
*result = 65535;
break;
}
return (0);