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

fix another LP64 problem. READ_IVAR takes a pointer to an uintptr_t, not

Browse Source 
an int.
This commit is contained in:
jmg 2003-06-20 07:22:54 +00:00
parent 28f550b7a0
commit a63ecc149e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pcf/pcf.c
View File

@ -139,6 +139,7 @@ pcf_probe(device_t pcfdev)
{ {
struct pcf_softc *pcf = DEVTOSOFTC(pcfdev); struct pcf_softc *pcf = DEVTOSOFTC(pcfdev);
device_t parent = device_get_parent(pcfdev); device_t parent = device_get_parent(pcfdev);
uintptr_t base;
device_set_desc(pcfdev, "PCF8584 I2C bus controller"); device_set_desc(pcfdev, "PCF8584 I2C bus controller");
@ -156,7 +157,8 @@ pcf_probe(device_t pcfdev)
device_printf(pcfdev, "cannot reserve I/O port range\n"); device_printf(pcfdev, "cannot reserve I/O port range\n");
goto error; goto error;
} }
BUS_READ_IVAR(parent, pcfdev, ISA_IVAR_PORT, &pcf->pcf_base); BUS_READ_IVAR(parent, pcfdev, ISA_IVAR_PORT, &base);
pcf->pcf_base = base;
pcf->pcf_flags = device_get_flags(pcfdev); pcf->pcf_flags = device_get_flags(pcfdev);

4
sys/i386/isa/pcf.c
View File

@ -139,6 +139,7 @@ pcf_probe(device_t pcfdev)
{ {
struct pcf_softc *pcf = DEVTOSOFTC(pcfdev); struct pcf_softc *pcf = DEVTOSOFTC(pcfdev);
device_t parent = device_get_parent(pcfdev); device_t parent = device_get_parent(pcfdev);
uintptr_t base;
device_set_desc(pcfdev, "PCF8584 I2C bus controller"); device_set_desc(pcfdev, "PCF8584 I2C bus controller");
@ -156,7 +157,8 @@ pcf_probe(device_t pcfdev)
device_printf(pcfdev, "cannot reserve I/O port range\n"); device_printf(pcfdev, "cannot reserve I/O port range\n");
goto error; goto error;
} }
BUS_READ_IVAR(parent, pcfdev, ISA_IVAR_PORT, &pcf->pcf_base); BUS_READ_IVAR(parent, pcfdev, ISA_IVAR_PORT, &base);
pcf->pcf_base = base;
pcf->pcf_flags = device_get_flags(pcfdev); pcf->pcf_flags = device_get_flags(pcfdev);