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

Fix several 64-bit-ism warnings due to sizeof(int) != sizeof(void *) on

Browse Source 
the alpha.
This commit is contained in:
John Baldwin 2000-09-22 08:40:05 +00:00
parent 8a90ed65a6
commit 86ab18a705
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/atkbdc/psm.c
View File

@ -773,7 +773,7 @@ doopen(int unit, int command_byte)
/* start the watchdog timer */
sc->watchdog = FALSE;
sc->callout = timeout(psmtimeout, (void *)unit, hz*2);
sc->callout = timeout(psmtimeout, (void *)(uintptr_t)unit, hz*2);
return (0);
}
@ -1088,7 +1088,7 @@ psmprobe(device_t dev)
RF_ACTIVE);
if (sc->intr == NULL) {
printf("psm%d: unable to allocate the IRQ resource (%d).\n",
unit, irq);
unit, (int)irq);
endprobe(ENXIO);
} else {
bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
@ -1298,7 +1298,7 @@ psmclose(dev_t dev, int flag, int fmt, struct proc *p)
splx(s);
/* stop the watchdog timer */
untimeout(psmtimeout, (void *)unit, sc->callout);
untimeout(psmtimeout, (void *)(uintptr_t)unit, sc->callout);
callout_handle_init(&sc->callout);
/* remove anything left in the output buffer */
@ -1829,7 +1829,7 @@ psmtimeout(void *arg)
int unit;
int s;
unit = (int)arg;
unit = (int)(uintptr_t)arg;
sc = devclass_get_softc(psm_devclass, unit);
s = spltty();
if (sc->watchdog && kbdc_lock(sc->kbdc, TRUE)) {
@ -1840,7 +1840,7 @@ psmtimeout(void *arg)
}
sc->watchdog = TRUE;
splx(s);
sc->callout = timeout(psmtimeout, (void *)unit, hz);
sc->callout = timeout(psmtimeout, (void *)(uintptr_t)unit, hz);
}
static void
@ -2681,7 +2681,7 @@ psmresume(device_t dev)
/* block our watchdog timer */
sc->watchdog = FALSE;
untimeout(psmtimeout, (void *)unit, sc->callout);
untimeout(psmtimeout, (void *)(uintptr_t)unit, sc->callout);
callout_handle_init(&sc->callout);
/* save the current controller command byte */

12
sys/isa/psm.c
View File

@ -773,7 +773,7 @@ doopen(int unit, int command_byte)
/* start the watchdog timer */
sc->watchdog = FALSE;
sc->callout = timeout(psmtimeout, (void *)unit, hz*2);
sc->callout = timeout(psmtimeout, (void *)(uintptr_t)unit, hz*2);
return (0);
}
@ -1088,7 +1088,7 @@ psmprobe(device_t dev)
RF_ACTIVE);
if (sc->intr == NULL) {
printf("psm%d: unable to allocate the IRQ resource (%d).\n",
unit, irq);
unit, (int)irq);
endprobe(ENXIO);
} else {
bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
@ -1298,7 +1298,7 @@ psmclose(dev_t dev, int flag, int fmt, struct proc *p)
splx(s);
/* stop the watchdog timer */
untimeout(psmtimeout, (void *)unit, sc->callout);
untimeout(psmtimeout, (void *)(uintptr_t)unit, sc->callout);
callout_handle_init(&sc->callout);
/* remove anything left in the output buffer */
@ -1829,7 +1829,7 @@ psmtimeout(void *arg)
int unit;
int s;
unit = (int)arg;
unit = (int)(uintptr_t)arg;
sc = devclass_get_softc(psm_devclass, unit);
s = spltty();
if (sc->watchdog && kbdc_lock(sc->kbdc, TRUE)) {
@ -1840,7 +1840,7 @@ psmtimeout(void *arg)
}
sc->watchdog = TRUE;
splx(s);
sc->callout = timeout(psmtimeout, (void *)unit, hz);
sc->callout = timeout(psmtimeout, (void *)(uintptr_t)unit, hz);
}
static void
@ -2681,7 +2681,7 @@ psmresume(device_t dev)
/* block our watchdog timer */
sc->watchdog = FALSE;
untimeout(psmtimeout, (void *)unit, sc->callout);
untimeout(psmtimeout, (void *)(uintptr_t)unit, sc->callout);
callout_handle_init(&sc->callout);
/* save the current controller command byte */