diff options
| author | jhb <jhb@FreeBSD.org> | 2000-09-22 08:40:05 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-09-22 08:40:05 +0000 |
| commit | dfad46a0af14f4d6ade918da8be8b570995d31e6 (patch) | |
| tree | 0c59ffc91806980f791c2a03d018af8369de91ee /sys/dev/atkbdc | |
| parent | 251eebb3470cf6a4c532d20558ca073f9e49b2b2 (diff) | |
| download | FreeBSD-src-dfad46a0af14f4d6ade918da8be8b570995d31e6.zip FreeBSD-src-dfad46a0af14f4d6ade918da8be8b570995d31e6.tar.gz | |
Fix several 64-bit-ism warnings due to sizeof(int) != sizeof(void *) on
the alpha.
Diffstat (limited to 'sys/dev/atkbdc')
| -rw-r--r-- | sys/dev/atkbdc/psm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index bd4c341..749c693 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -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 */ |
