diff options
-rw-r--r-- | sys/dev/fe/if_fe.c | 4 | ||||
-rw-r--r-- | sys/dev/lnc/if_lnc.c | 10 | ||||
-rw-r--r-- | sys/dev/pdq/if_fea.c | 4 | ||||
-rw-r--r-- | sys/dev/rp/rp.c | 4 | ||||
-rw-r--r-- | sys/dev/si/si.c | 6 | ||||
-rw-r--r-- | sys/dev/wl/if_wl.c | 4 | ||||
-rw-r--r-- | sys/i386/eisa/if_fea.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_fe.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_lnc.c | 10 | ||||
-rw-r--r-- | sys/i386/isa/if_rdp.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/if_wl.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/psm.c | 11 | ||||
-rw-r--r-- | sys/i386/isa/rp.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/si.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/stallion.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/wst.c | 7 | ||||
-rw-r--r-- | sys/pc98/pc98/wst.c | 7 |
17 files changed, 59 insertions, 39 deletions
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index bb1b01c..1cd5268 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.45 1998/12/15 15:51:37 kato Exp $ + * $Id: if_fe.c,v 1.46 1998/12/31 03:21:14 kato Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 3.x @@ -3823,7 +3823,9 @@ fe_get_packet ( struct fe_softc * sc, u_short len ) return 0; } +#ifdef BRIDGE getit: +#endif /* Strip off the Ethernet header. */ m->m_pkthdr.len -= sizeof ( struct ether_header ); m->m_len -= sizeof ( struct ether_header ); diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index aefe1e9..0e74247 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_lnc.c,v 1.49 1998/11/26 00:53:45 paul Exp $ + * $Id: if_lnc.c,v 1.50 1998/11/26 00:57:32 paul Exp $ */ /* @@ -184,8 +184,8 @@ static void lnc_start __P((struct ifnet *ifp)); static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data)); static void lnc_watchdog __P((struct ifnet *ifp)); #ifdef DEBUG -static void lnc_dump_state __P((struct lnc_softc *sc)); -static void mbuf_dump_chain __P((struct mbuf *m)); +void lnc_dump_state __P((struct lnc_softc *sc)); +void mbuf_dump_chain __P((struct mbuf *m)); #endif #if NPCI > 0 @@ -1896,7 +1896,7 @@ lnc_watchdog(struct ifnet *ifp) } #ifdef DEBUG -static void +void lnc_dump_state(struct lnc_softc *sc) { int i; @@ -1951,7 +1951,7 @@ lnc_dump_state(struct lnc_softc *sc) outw(sc->rap, CSR0); } -static void +void mbuf_dump_chain(struct mbuf * m) { diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c index c0fce89..fd9447e 100644 --- a/sys/dev/pdq/if_fea.c +++ b/sys/dev/pdq/if_fea.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_fea.c,v 1.11 1998/12/09 02:18:53 eivind Exp $ + * $Id: if_fea.c,v 1.12 1999/01/01 12:35:47 bde Exp $ */ /* @@ -207,7 +207,7 @@ pdq_eisa_attach( sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT); if (sc == NULL) { - printf("fea%d: malloc failed!\n", ed->unit); + printf("fea%ld: malloc failed!\n", ed->unit); return -1; } pdqs_eisa[ed->unit] = sc; diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 7dd8c6d..28acaee 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -768,7 +768,7 @@ void sDisInterrupts(CHANNEL_T *ChP,Word_t Flags) static int rpprobe __P((struct isa_device *)); static int rpattach __P((struct isa_device *)); -static char* rp_pciprobe(pcici_t tag, pcidi_t type); +static const char* rp_pciprobe(pcici_t tag, pcidi_t type); static void rp_pciattach(pcici_t tag, int unit); static u_long rp_pcicount; @@ -1007,7 +1007,7 @@ static void rp_do_poll(void *not_used) timeout(rp_do_poll, (void *)NULL, POLL_INTERVAL); } -static char* +static const char* rp_pciprobe(pcici_t tag, pcidi_t type) { int vendor_id; diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 4f91d8a..230e387 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.76 1998/08/23 08:26:40 bde Exp $ + * $Id: si.c,v 1.77 1998/08/23 10:12:12 bde Exp $ */ #ifndef lint @@ -133,7 +133,7 @@ static u_long sipcieisacount = 0; #if NPCI > 0 -static char *sipciprobe __P((pcici_t, pcidi_t)); +static const char *sipciprobe __P((pcici_t, pcidi_t)); static void sipciattach __P((pcici_t, int)); static struct pci_device sipcidev = { @@ -316,7 +316,7 @@ static char *si_type[] = { #if NPCI > 0 -static char * +static const char * sipciprobe(configid, deviceid) pcici_t configid; pcidi_t deviceid; diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 081f4b4..42fc0f9 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -1,4 +1,4 @@ -/* $Id: if_wl.c,v 1.18 1998/12/07 21:58:21 archie Exp $ */ +/* $Id: if_wl.c,v 1.19 1998/12/09 03:30:51 eivind Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -2549,7 +2549,7 @@ static void wl_cache_store (int unit, int base, struct ether_header *eh, struct mbuf *m) { - struct ip *ip; + struct ip *ip = NULL; /* Avoid GCC warning */ int i; int signal, silence; int w_insertcache; /* computed index for cache entry storage */ diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c index c0fce89..fd9447e 100644 --- a/sys/i386/eisa/if_fea.c +++ b/sys/i386/eisa/if_fea.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_fea.c,v 1.11 1998/12/09 02:18:53 eivind Exp $ + * $Id: if_fea.c,v 1.12 1999/01/01 12:35:47 bde Exp $ */ /* @@ -207,7 +207,7 @@ pdq_eisa_attach( sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT); if (sc == NULL) { - printf("fea%d: malloc failed!\n", ed->unit); + printf("fea%ld: malloc failed!\n", ed->unit); return -1; } pdqs_eisa[ed->unit] = sc; diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c index bb1b01c..1cd5268 100644 --- a/sys/i386/isa/if_fe.c +++ b/sys/i386/isa/if_fe.c @@ -21,7 +21,7 @@ */ /* - * $Id: if_fe.c,v 1.45 1998/12/15 15:51:37 kato Exp $ + * $Id: if_fe.c,v 1.46 1998/12/31 03:21:14 kato Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * To be used with FreeBSD 3.x @@ -3823,7 +3823,9 @@ fe_get_packet ( struct fe_softc * sc, u_short len ) return 0; } +#ifdef BRIDGE getit: +#endif /* Strip off the Ethernet header. */ m->m_pkthdr.len -= sizeof ( struct ether_header ); m->m_len -= sizeof ( struct ether_header ); diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c index aefe1e9..0e74247 100644 --- a/sys/i386/isa/if_lnc.c +++ b/sys/i386/isa/if_lnc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_lnc.c,v 1.49 1998/11/26 00:53:45 paul Exp $ + * $Id: if_lnc.c,v 1.50 1998/11/26 00:57:32 paul Exp $ */ /* @@ -184,8 +184,8 @@ static void lnc_start __P((struct ifnet *ifp)); static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data)); static void lnc_watchdog __P((struct ifnet *ifp)); #ifdef DEBUG -static void lnc_dump_state __P((struct lnc_softc *sc)); -static void mbuf_dump_chain __P((struct mbuf *m)); +void lnc_dump_state __P((struct lnc_softc *sc)); +void mbuf_dump_chain __P((struct mbuf *m)); #endif #if NPCI > 0 @@ -1896,7 +1896,7 @@ lnc_watchdog(struct ifnet *ifp) } #ifdef DEBUG -static void +void lnc_dump_state(struct lnc_softc *sc) { int i; @@ -1951,7 +1951,7 @@ lnc_dump_state(struct lnc_softc *sc) outw(sc->rap, CSR0); } -static void +void mbuf_dump_chain(struct mbuf * m) { diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c index 63e7f5b..0d29b0a 100644 --- a/sys/i386/isa/if_rdp.c +++ b/sys/i386/isa/if_rdp.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_rdp.c,v 1.1.1.1 1998/12/21 12:43:35 j Exp $ + * $Id: if_rdp.c,v 1.2 1998/12/21 18:11:10 joerg Exp $ */ /* @@ -109,6 +109,7 @@ * 2 - debug EEPROM IO * 4 - debug interrupt status */ +#undef DEBUG #define DEBUG 0 /* diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c index 081f4b4..42fc0f9 100644 --- a/sys/i386/isa/if_wl.c +++ b/sys/i386/isa/if_wl.c @@ -1,4 +1,4 @@ -/* $Id: if_wl.c,v 1.18 1998/12/07 21:58:21 archie Exp $ */ +/* $Id: if_wl.c,v 1.19 1998/12/09 03:30:51 eivind Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -2549,7 +2549,7 @@ static void wl_cache_store (int unit, int base, struct ether_header *eh, struct mbuf *m) { - struct ip *ip; + struct ip *ip = NULL; /* Avoid GCC warning */ int i; int signal, silence; int w_insertcache; /* computed index for cache entry storage */ diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index 07290af..ca85f57 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.58 1999/01/06 05:40:01 yokota Exp $ + * $Id: psm.c,v 1.59 1999/01/11 03:18:23 yokota Exp $ */ /* @@ -240,12 +240,16 @@ static int get_aux_id __P((KBDC)); static int set_mouse_sampling_rate __P((KBDC, int)); static int set_mouse_scaling __P((KBDC, int)); static int set_mouse_resolution __P((KBDC, int)); +#ifdef PSM_RESETAFTERSUSPEND static int set_mouse_mode __P((KBDC)); +#endif /* PSM_RESETAFTERSUSPEND */ static int get_mouse_buttons __P((KBDC)); static int is_a_mouse __P((int)); static void recover_from_error __P((KBDC)); static int restore_controller __P((KBDC, int)); +#ifdef PSM_RESETAFTERSUSPEND static int reinitialize __P((int, mousemode_t *)); +#endif static int doopen __P((int, int)); static char *model_name(int); static ointhand2_t psmintr; @@ -431,6 +435,7 @@ set_mouse_resolution(KBDC kbdc, int val) return ((res == PSM_ACK) ? val : -1); } +#ifdef PSM_RESETAFTERSUSPEND /* * NOTE: once `set_mouse_mode()' is called, the mouse device must be * re-enabled by calling `enable_aux_dev()' @@ -446,6 +451,8 @@ set_mouse_mode(KBDC kbdc) return (res == PSM_ACK); } +#endif /* PSM_RESETAFTERSUSPEND */ + static int get_mouse_buttons(KBDC kbdc) @@ -563,6 +570,7 @@ restore_controller(KBDC kbdc, int command_byte) } } +#ifdef PSM_RESETAFTERSUSPEND /* * Re-initialize the aux port and device. The aux port must be enabled * and its interrupt must be disabled before calling this routine. @@ -669,6 +677,7 @@ reinitialize(int unit, mousemode_t *mode) return TRUE; } +#endif /* PSM_RESETAFTERSUSPEND */ static int doopen(int unit, int command_byte) diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c index 7dd8c6d..28acaee 100644 --- a/sys/i386/isa/rp.c +++ b/sys/i386/isa/rp.c @@ -768,7 +768,7 @@ void sDisInterrupts(CHANNEL_T *ChP,Word_t Flags) static int rpprobe __P((struct isa_device *)); static int rpattach __P((struct isa_device *)); -static char* rp_pciprobe(pcici_t tag, pcidi_t type); +static const char* rp_pciprobe(pcici_t tag, pcidi_t type); static void rp_pciattach(pcici_t tag, int unit); static u_long rp_pcicount; @@ -1007,7 +1007,7 @@ static void rp_do_poll(void *not_used) timeout(rp_do_poll, (void *)NULL, POLL_INTERVAL); } -static char* +static const char* rp_pciprobe(pcici_t tag, pcidi_t type) { int vendor_id; diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 4f91d8a..230e387 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.76 1998/08/23 08:26:40 bde Exp $ + * $Id: si.c,v 1.77 1998/08/23 10:12:12 bde Exp $ */ #ifndef lint @@ -133,7 +133,7 @@ static u_long sipcieisacount = 0; #if NPCI > 0 -static char *sipciprobe __P((pcici_t, pcidi_t)); +static const char *sipciprobe __P((pcici_t, pcidi_t)); static void sipciattach __P((pcici_t, int)); static struct pci_device sipcidev = { @@ -316,7 +316,7 @@ static char *si_type[] = { #if NPCI > 0 -static char * +static const char * sipciprobe(configid, deviceid) pcici_t configid; pcidi_t deviceid; diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 3fde903..e6697a1 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.22 1998/08/23 09:57:09 bde Exp $ + * $Id: stallion.c,v 1.23 1998/10/22 05:58:40 bde Exp $ */ /*****************************************************************************/ @@ -491,7 +491,7 @@ static int stl_clrportstats(stlport_t *portp, caddr_t data); static stlport_t *stl_getport(int brdnr, int panelnr, int portnr); #if NPCI > 0 -static char *stlpciprobe(pcici_t tag, pcidi_t type); +static const char *stlpciprobe(pcici_t tag, pcidi_t type); static void stlpciattach(pcici_t tag, int unit); static void stlpciintr(void * arg); #endif @@ -673,7 +673,7 @@ static int stlattach(struct isa_device *idp) * carefull here, since it looks sort like a Nat Semi IDE chip... */ -char *stlpciprobe(pcici_t tag, pcidi_t type) +static const char *stlpciprobe(pcici_t tag, pcidi_t type) { unsigned long class; diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c index 4f159b5..1bf43a7 100644 --- a/sys/i386/isa/wst.c +++ b/sys/i386/isa/wst.c @@ -25,12 +25,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wst.c,v 1.12 1998/09/15 18:16:38 sos Exp $ + * $Id: wst.c,v 1.13 1998/12/07 21:58:24 archie Exp $ */ #include "wdc.h" #include "wst.h" #include "opt_atapi.h" +#include "opt_ddb.h" #include "opt_devfs.h" #if NWST > 0 && NWDC > 0 && defined(ATAPI) @@ -211,7 +212,8 @@ static int wst_load_unload(struct wst *t, u_char finction); static int wst_rewind(struct wst *t); static void wst_reset(struct wst *t); -static void +#ifdef DDB +void wst_dump(int lun, char *label, void *data, int len) { u_char *p = data; @@ -221,6 +223,7 @@ wst_dump(int lun, char *label, void *data, int len) printf("-%x", *p++); printf("\n"); } +#endif #ifndef ATAPI_STATIC static diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c index 4f159b5..1bf43a7 100644 --- a/sys/pc98/pc98/wst.c +++ b/sys/pc98/pc98/wst.c @@ -25,12 +25,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wst.c,v 1.12 1998/09/15 18:16:38 sos Exp $ + * $Id: wst.c,v 1.13 1998/12/07 21:58:24 archie Exp $ */ #include "wdc.h" #include "wst.h" #include "opt_atapi.h" +#include "opt_ddb.h" #include "opt_devfs.h" #if NWST > 0 && NWDC > 0 && defined(ATAPI) @@ -211,7 +212,8 @@ static int wst_load_unload(struct wst *t, u_char finction); static int wst_rewind(struct wst *t); static void wst_reset(struct wst *t); -static void +#ifdef DDB +void wst_dump(int lun, char *label, void *data, int len) { u_char *p = data; @@ -221,6 +223,7 @@ wst_dump(int lun, char *label, void *data, int len) printf("-%x", *p++); printf("\n"); } +#endif #ifndef ATAPI_STATIC static |