| psm.c (43105) | psm.c (45720) |
|---|---|
| 1/*- 2 * Copyright (c) 1992, 1993 Erik Forsberg. 3 * Copyright (c) 1996, 1997 Kazutaka YOKOTA. 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 6 unchanged lines hidden (view full) --- 15 * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 16 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 17 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 18 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 19 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 20 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * | 1/*- 2 * Copyright (c) 1992, 1993 Erik Forsberg. 3 * Copyright (c) 1996, 1997 Kazutaka YOKOTA. 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 6 unchanged lines hidden (view full) --- 15 * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 16 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 17 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 18 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 19 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 20 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * |
| 23 * $Id: psm.c,v 1.2 1998/11/15 18:25:17 dfr Exp $ | 23 * $Id: psm.c,v 1.3 1999/01/23 16:53:28 dfr Exp $ |
| 24 */ 25 26/* 27 * Ported to 386bsd Oct 17, 1992 28 * Sandi Donno, Computer Science, University of Cape Town, South Africa 29 * Please send bug reports to sandi@cs.uct.ac.za 30 * 31 * Thanks are also due to Rick Macklem, rick@snowhite.cis.uoguelph.ca - --- 39 unchanged lines hidden (view full) --- 71#include <sys/systm.h> 72#include <sys/kernel.h> 73#include <sys/module.h> 74#include <sys/bus.h> 75#include <sys/conf.h> 76#include <sys/poll.h> 77#include <sys/syslog.h> 78#include <sys/malloc.h> | 24 */ 25 26/* 27 * Ported to 386bsd Oct 17, 1992 28 * Sandi Donno, Computer Science, University of Cape Town, South Africa 29 * Please send bug reports to sandi@cs.uct.ac.za 30 * 31 * Thanks are also due to Rick Macklem, rick@snowhite.cis.uoguelph.ca - --- 39 unchanged lines hidden (view full) --- 71#include <sys/systm.h> 72#include <sys/kernel.h> 73#include <sys/module.h> 74#include <sys/bus.h> 75#include <sys/conf.h> 76#include <sys/poll.h> 77#include <sys/syslog.h> 78#include <sys/malloc.h> |
| 79#include <machine/bus.h> |
|
| 79#include <sys/rman.h> 80#ifdef DEVFS 81#include <sys/devfsext.h> 82#endif 83#include <sys/select.h> 84#include <sys/uio.h> 85 86#include <machine/clock.h> --- 648 unchanged lines hidden (view full) --- 735 return (v); \ 736 } 737 738static int 739psmprobe(device_t dev) 740{ 741 int unit = device_get_unit(dev); 742 struct psm_softc *sc = device_get_softc(dev); | 80#include <sys/rman.h> 81#ifdef DEVFS 82#include <sys/devfsext.h> 83#endif 84#include <sys/select.h> 85#include <sys/uio.h> 86 87#include <machine/clock.h> --- 648 unchanged lines hidden (view full) --- 736 return (v); \ 737 } 738 739static int 740psmprobe(device_t dev) 741{ 742 int unit = device_get_unit(dev); 743 struct psm_softc *sc = device_get_softc(dev); |
| 743 u_long port; 744 u_long flags; | 744 uintptr_t port; 745 uintptr_t flags; |
| 745 int stat[3]; 746 int command_byte; 747 int mask; 748 int i; 749 750#if 0 751 kbdc_debug(TRUE); 752#endif --- 233 unchanged lines hidden (view full) --- 986 987static int 988psmattach(device_t dev) 989{ 990 int unit = device_get_unit(dev); 991 struct psm_softc *sc = device_get_softc(dev); 992 void *ih; 993 struct resource *res; | 746 int stat[3]; 747 int command_byte; 748 int mask; 749 int i; 750 751#if 0 752 kbdc_debug(TRUE); 753#endif --- 233 unchanged lines hidden (view full) --- 987 988static int 989psmattach(device_t dev) 990{ 991 int unit = device_get_unit(dev); 992 struct psm_softc *sc = device_get_softc(dev); 993 void *ih; 994 struct resource *res; |
| 994 u_long irq; | 995 uintptr_t irq; |
| 995 int zero = 0; 996 997 if (sc == NULL) /* shouldn't happen */ 998 return (ENXIO); 999 1000 /* Setup initial state */ 1001 sc->state = PSM_VALID; 1002 --- 1229 unchanged lines hidden --- | 996 int zero = 0; 997 998 if (sc == NULL) /* shouldn't happen */ 999 return (ENXIO); 1000 1001 /* Setup initial state */ 1002 sc->state = PSM_VALID; 1003 --- 1229 unchanged lines hidden --- |