diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2002-02-01 21:48:24 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2002-02-01 21:48:24 +0000 |
| commit | 3e1b9f4bfaf7e368b07e31c7ea2af2d663fa6c83 (patch) | |
| tree | afeb8523620c6fa2455f0901bf6d2507e5c639c6 /sys/arch/sparc64/dev/auxiovar.h | |
| parent | c6e798b53d04b34233a34e564b5dba6a0d500e0d (diff) | |
Clean up auxio a bit and add machdep.led_blink sysctl (like sparc),
portions from NetBSD.
Diffstat (limited to 'sys/arch/sparc64/dev/auxiovar.h')
| -rw-r--r-- | sys/arch/sparc64/dev/auxiovar.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sys/arch/sparc64/dev/auxiovar.h b/sys/arch/sparc64/dev/auxiovar.h index 95a59b506cf..58f5ef4ca6d 100644 --- a/sys/arch/sparc64/dev/auxiovar.h +++ b/sys/arch/sparc64/dev/auxiovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auxiovar.h,v 1.2 2001/08/29 02:47:58 jason Exp $ */ +/* $OpenBSD: auxiovar.h,v 1.3 2002/02/01 21:48:23 jason Exp $ */ /* $NetBSD: auxiovar.h,v 1.4 2000/04/15 03:08:13 mrg Exp $ */ /* @@ -39,26 +39,19 @@ * (to deal with multiple auxio's that may appear.) */ -struct auxio_registers { -#if 0 /* these do not exist on the Ebus2 */ - volatile u_int32_t *auxio_fd; - volatile u_int32_t *auxio_audio; - volatile u_int32_t *auxio_power; -#endif - volatile u_int32_t *auxio_led; - volatile u_int32_t *auxio_pci; - volatile u_int32_t *auxio_freq; - volatile u_int32_t *auxio_scsi; - volatile u_int32_t *auxio_temp; -}; - struct auxio_softc { struct device sc_dev; - struct auxio_registers sc_registers; + bus_space_tag_t sc_tag; + bus_space_handle_t sc_led; + bus_space_handle_t sc_pci; + bus_space_handle_t sc_scsi; + bus_space_handle_t sc_freq; + bus_space_handle_t sc_temp; int sc_flags; #define AUXIO_LEDONLY 0x1 #define AUXIO_EBUS 0x2 #define AUXIO_SBUS 0x4 + struct timeout sc_to; }; /* @@ -71,4 +64,5 @@ struct auxio_softc { */ volatile u_char *auxio_reg; unsigned int auxregbisc __P((int, int)); +void auxio_led_blink __P((void *)); #endif |