diff options
author | Martin Reindl <martin@cvs.openbsd.org> | 2006-04-14 09:36:50 +0000 |
---|---|---|
committer | Martin Reindl <martin@cvs.openbsd.org> | 2006-04-14 09:36:50 +0000 |
commit | f4b501b356fb77c2db87209cd41f54ffd02c5637 (patch) | |
tree | 9e676452ffcbee0d2c161979d428ea9479a1d227 /sys/arch/mac68k/dev | |
parent | 2d43125fac93f2934882d329976deb9587aaa8d0 (diff) |
rm trailing whitespace
Diffstat (limited to 'sys/arch/mac68k/dev')
-rw-r--r-- | sys/arch/mac68k/dev/adb.c | 54 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/asc.c | 6 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/if_ae.c | 6 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/if_sn.c | 30 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/macfb.c | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 16 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/nubus.c | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/nubus.h | 12 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/sbc_obio.c | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/sbcvar.h | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/z8530tty.c | 8 |
11 files changed, 74 insertions, 74 deletions
diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c index 6b6030baa54..717a12055bb 100644 --- a/sys/arch/mac68k/dev/adb.c +++ b/sys/arch/mac68k/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.22 2006/02/12 17:03:25 miod Exp $ */ +/* $OpenBSD: adb.c,v 1.23 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: adb.c,v 1.47 2005/06/16 22:43:36 jmc Exp $ */ /* $NetBSD: adb_direct.c,v 1.51 2005/06/16 22:43:36 jmc Exp $ */ @@ -67,25 +67,25 @@ * to clean it up as much as I would like. * But it works, so I'm happy. :-) jpw */ - + /* * TO DO: * - We could reduce the time spent in the adb_intr_* routines - * by having them save the incoming and outgoing data directly + * by having them save the incoming and outgoing data directly * in the adbInbound and adbOutbound queues, as it would reduce * the number of times we need to copy the data around. It * would also make the code more readable and easier to follow. - * - (Related to above) Use the header part of adbCommand to + * - (Related to above) Use the header part of adbCommand to * reduce the number of copies we have to do of the data. * - (Related to above) Actually implement the adbOutbound queue. * This is fairly easy once you switch all the intr routines * over to using adbCommand structs directly. * - There is a bug in the state machine of adb_intr_cuda * code that causes hangs, especially on 030 machines, probably - * because of some timing issues. Because I have been unable to - * determine the exact cause of this bug, I used the timeout function - * to check for and recover from this condition. If anyone finds - * the actual cause of this bug, the calls to timeout and the + * because of some timing issues. Because I have been unable to + * determine the exact cause of this bug, I used the timeout function + * to check for and recover from this condition. If anyone finds + * the actual cause of this bug, the calls to timeout and the * adb_cuda_tickle routine can be removed. */ @@ -213,7 +213,7 @@ struct adbCmdHoldEntry { }; /* - * Eventually used for two separate queues, the queue between + * Eventually used for two separate queues, the queue between * the upper and lower halves, and the outgoing packet queue. * TO DO: adbCommand can replace all of adbCmdHoldEntry eventually */ @@ -980,7 +980,7 @@ switch_start: packet.ack_only = 1; adb_pass_up(&packet); - /* reset "waiting" vars, just in case */ + /* reset "waiting" vars, just in case */ adbBuffer = (long)0; adbCompRout = (long)0; adbCompData = (long)0; @@ -1514,7 +1514,7 @@ send_adb_IIsi(u_char *in, u_char *buffer, void *compRout, void *data, int return 0; } /* send_adb_IIsi */ -/* +/* * adb_pass_up is called by the interrupt-time routines. * It takes the raw packet data that was received from the * device and puts it into the queue that the upper half @@ -1522,7 +1522,7 @@ send_adb_IIsi(u_char *in, u_char *buffer, void *compRout, void *data, int * will eventually call the upper half routine (adb_soft_intr). * * If in->unsol is 0, then this is either the notification - * that the packet was sent (on a LISTEN, for example), or the + * that the packet was sent (on a LISTEN, for example), or the * response from the device (on a TALK). The completion routine * is called only if the user specified one. * @@ -1628,14 +1628,14 @@ adb_pass_up(struct adbCommand *in) } #ifdef ADB_DEBUG - if (adb_debug && in->data[1] == 2) + if (adb_debug && in->data[1] == 2) printf_intr("adb: caught error\n"); #endif /* copy the packet data over */ /* * TO DO: If the *_intr routines fed their incoming data - * directly into an adbCommand struct, which is passed to + * directly into an adbCommand struct, which is passed to * this routine, then we could eliminate this copy. */ memcpy(adbInbound[adbInTail].data + 1, in->data + start + 1, len); @@ -2030,7 +2030,7 @@ adb_reinit(struct device *self) * responds at that address. Then move the last device that was moved * back to the original address. Do this for the remaining addresses * that we determined were in use. - * + * * When finished, do this entire process over again with the updated * list of in use addresses. Do this until no new devices have been * found in 20 passes though the in use address list. (This probably @@ -2267,7 +2267,7 @@ adb_cmd_result(u_char *in) } } -void +void adb_setup_hw_type(void) { /* @@ -2389,7 +2389,7 @@ adb_op_sync(Ptr buffer, Ptr compRout, Ptr data, short command) int result; volatile int flag = 0; - result = adb_op(buffer, (void *)adb_op_comprout, (Ptr)&flag, + result = adb_op(buffer, (void *)adb_op_comprout, (Ptr)&flag, command); /* send command */ if (result == 0) { /* send ok? */ /* @@ -2426,13 +2426,13 @@ adb_op_sync(Ptr buffer, Ptr compRout, Ptr data, short command) * This function is used by the adb_op_sync routine so it knows when the * function is done. */ -void +void adb_op_comprout(caddr_t buffer, caddr_t data_area, int adb_command) { *(u_short *)data_area = 0x01; /* update flag value */ } -int +int count_adbs(void) { int i; @@ -2447,7 +2447,7 @@ count_adbs(void) return found; } -int +int get_ind_adb_info(ADBDataBlock *info, int index) { if ((index < 1) || (index > 15)) /* check range 1-15 */ @@ -2469,7 +2469,7 @@ get_ind_adb_info(ADBDataBlock *info, int index) return (ADBDevTable[index].currentAddr); } -int +int get_adb_info(ADBDataBlock *info, int adbAddr) { int i; @@ -2489,7 +2489,7 @@ get_adb_info(ADBDataBlock *info, int adbAddr) return (-1); /* not found */ } -int +int set_adb_info(ADBSetInfoBlock *info, int adbAddr) { int i; @@ -2511,7 +2511,7 @@ set_adb_info(ADBSetInfoBlock *info, int adbAddr) /* caller should really use machine-independant version: getPramTime */ /* this version does pseudo-adb access only */ -int +int adb_read_date_time(unsigned long *time) { u_char output[ADB_MAX_MSG_LENGTH]; @@ -2564,7 +2564,7 @@ adb_read_date_time(unsigned long *time) /* caller should really use machine-independant version: setPramTime */ /* this version does pseudo-adb access only */ -int +int adb_set_date_time(unsigned long time) { u_char output[ADB_MAX_MSG_LENGTH]; @@ -2622,7 +2622,7 @@ adb_set_date_time(unsigned long time) } -int +int adb_poweroff(void) { u_char output[ADB_MAX_MSG_LENGTH]; @@ -2671,7 +2671,7 @@ adb_poweroff(void) } } -int +int adb_prog_switch_enable(void) { u_char output[ADB_MAX_MSG_LENGTH]; @@ -2707,7 +2707,7 @@ adb_prog_switch_enable(void) } #if 0 -int +int adb_prog_switch_disable(void) { u_char output[ADB_MAX_MSG_LENGTH]; diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c index b11bbeba0a7..02633582edd 100644 --- a/sys/arch/mac68k/dev/asc.c +++ b/sys/arch/mac68k/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.23 2006/03/15 20:03:06 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.24 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */ /* @@ -294,7 +294,7 @@ ascmmap(dev, off, prot) return (-1); } -static int +static int asc_ring_bell(arg, freq, length, volume) void *arg; int freq, length, volume; @@ -345,7 +345,7 @@ asc_ring_bell(arg, freq, length, volume) return (0); } -static void +static void asc_stop_bell(arg) void *arg; { diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c index f61eff22884..bb9f51a5633 100644 --- a/sys/arch/mac68k/dev/if_ae.c +++ b/sys/arch/mac68k/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae.c,v 1.29 2006/03/25 22:41:41 djm Exp $ */ +/* $OpenBSD: if_ae.c,v 1.30 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: if_ae.c,v 1.62 1997/04/24 16:52:05 scottr Exp $ */ /* @@ -62,11 +62,11 @@ static inline int ae_ring_copy( struct ae_softc *, int, caddr_t, int); #define NIC_PUT(sc, reg, val) (bus_space_write_1((sc)->sc_regt, \ (sc)->sc_regh, \ ((sc)->sc_reg_map[reg]), (val))) - + struct cfdriver ae_cd = { NULL, "ae", DV_IFNET }; - + int ae_size_card_memory(bst, bsh, ofs) bus_space_tag_t bst; diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c index 37edb8c0677..391faa50f52 100644 --- a/sys/arch/mac68k/dev/if_sn.c +++ b/sys/arch/mac68k/dev/if_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn.c,v 1.42 2006/03/25 22:41:41 djm Exp $ */ +/* $OpenBSD: if_sn.c,v 1.43 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $ */ /* @@ -405,7 +405,7 @@ snreset(struct sn_softc *sc) sninit(sc); } -static int +static int sninit(struct sn_softc *sc) { u_long s_rcr; @@ -475,7 +475,7 @@ sninit(struct sn_softc *sc) * Called on final close of device, or if sninit() fails * part way through. */ -static int +static int snstop(struct sn_softc *sc) { struct mtd *mtd; @@ -529,7 +529,7 @@ snwatchdog(struct ifnet *ifp) /* * stuff packet into sonic (at splnet) */ -static __inline__ int +static __inline__ int sonicput(struct sn_softc *sc, struct mbuf *m0, int mtd_next) { struct mtd *mtdp; @@ -612,7 +612,7 @@ sonicput(struct sn_softc *sc, struct mbuf *m0, int mtd_next) /* * CAM support */ -static void +static void caminitialise(struct sn_softc *sc) { void *p_cda = sc->p_cda; @@ -630,7 +630,7 @@ caminitialise(struct sn_softc *sc) SWO(bitmode, p_cda, CDA_ENABLE, 0); } -static void +static void camentry(struct sn_softc *sc, int entry, u_char *ea) { void *p_cda = sc->p_cda; @@ -641,11 +641,11 @@ camentry(struct sn_softc *sc, int entry, u_char *ea) SWO(bitmode, p_cda, camoffset + CDA_CAMAP2, (ea[5] << 8) | ea[4]); SWO(bitmode, p_cda, camoffset + CDA_CAMAP1, (ea[3] << 8) | ea[2]); SWO(bitmode, p_cda, camoffset + CDA_CAMAP0, (ea[1] << 8) | ea[0]); - SWO(bitmode, p_cda, CDA_ENABLE, + SWO(bitmode, p_cda, CDA_ENABLE, (SRO(bitmode, p_cda, CDA_ENABLE) | (1 << entry))); } -static void +static void camprogram(struct sn_softc *sc) { struct ether_multistep step; @@ -717,7 +717,7 @@ camprogram(struct sn_softc *sc) } #ifdef SNDEBUG -static void +static void camdump(struct sn_softc *sc) { int i; @@ -742,7 +742,7 @@ camdump(struct sn_softc *sc) } #endif -static void +static void initialise_tda(struct sn_softc *sc) { struct mtd *mtd; @@ -890,7 +890,7 @@ snintr(void *arg) /* * Transmit interrupt routine */ -static void +static void sonictxint(struct sn_softc *sc) { struct mtd *mtd; @@ -962,7 +962,7 @@ sonictxint(struct sn_softc *sc) /* * Receive interrupt routine */ -static void +static void sonicrxint(struct sn_softc *sc) { caddr_t rda; @@ -1051,7 +1051,7 @@ sonicrxint(struct sn_softc *sc) * sonic_read -- pull packet off interface and forward to * appropriate protocol handler */ -static __inline__ int +static __inline__ int sonic_read(struct sn_softc *sc, caddr_t pkt, int len) { struct ifnet *ifp = &sc->sc_if; @@ -1084,8 +1084,8 @@ sonic_read(struct sn_softc *sc, caddr_t pkt, int len) return (0); #if NBPFILTER > 0 /* Pass this up to any BPF listeners. */ - if (ifp->if_bpf) - bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN); + if (ifp->if_bpf) + bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN); #endif ether_input_mbuf(ifp, m); return (1); diff --git a/sys/arch/mac68k/dev/macfb.c b/sys/arch/mac68k/dev/macfb.c index 26053c73f35..a72a2e3c1e2 100644 --- a/sys/arch/mac68k/dev/macfb.c +++ b/sys/arch/mac68k/dev/macfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macfb.c,v 1.15 2006/03/13 22:35:17 miod Exp $ */ +/* $OpenBSD: macfb.c,v 1.16 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: macfb.c,v 1.11 2005/01/15 16:00:59 chs Exp $ */ /* * Copyright (c) 1998 Matt DeBergalis @@ -235,7 +235,7 @@ macfb_color_setup(struct macfb_devconfig *dc) /* * Tweak colormap * - * Due to the way rasops cursor work, we need to provide + * Due to the way rasops cursor work, we need to provide * inverted copies of the 8 basic colors as the other 8 * in 4bpp mode. */ diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index eedfe431187..3f0ccb9c588 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.26 2006/02/06 17:19:31 jmc Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.27 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -170,7 +170,7 @@ extern __inline__ void finish_req(SC_REQ *reqp) /* * If we bounced, free the bounce buffer */ - if (reqp->dr_flag & DRIVER_BOUNCING) + if (reqp->dr_flag & DRIVER_BOUNCING) free_bounceb(reqp->bounceb); #endif /* REAL_DMA */ #ifdef DBG_REQ @@ -462,7 +462,7 @@ struct ncr_softc *sc; /* * Found one, remove it from the issue queue */ - if (prev == NULL) + if (prev == NULL) issue_q = req->next; else prev->next = req->next; req->next = NULL; @@ -483,7 +483,7 @@ struct ncr_softc *sc; if ((GET_5380_REG(NCR5380_IDSTAT) & (SC_S_SEL|SC_S_IO)) == (SC_S_SEL|SC_S_IO)){ if (req != NULL) { - req->next = issue_q; + req->next = issue_q; issue_q = req; } splx(sps); @@ -518,7 +518,7 @@ struct ncr_softc *sc; */ if (scsi_select(req, 0)) { sps = splbio(); - req->next = issue_q; + req->next = issue_q; issue_q = req; splx(sps); #ifdef DBG_REQ @@ -717,7 +717,7 @@ int code; */ SET_5380_REG(NCR5380_DATA, SC_HOST_ID); SET_5380_REG(NCR5380_MODE, SC_ARBIT); - + splx(sps); cnt = 10; @@ -867,7 +867,7 @@ int code; * Since we followed the SCSI-spec and raised ATN while SEL was true * but before BSY was false during the selection, a 'MESSAGE OUT' * phase should follow. Unfortunately, this does not happen on - * all targets (Asante ethernet devices, for example), so we must + * all targets (Asante ethernet devices, for example), so we must * check the actual mode if the message transfer fails--if the * new phase is PH_CMD and has never been successfully selected * w/ATN in the past, then we assume that it is an old device @@ -1195,7 +1195,7 @@ u_int msg; nack_message(reqp, MSG_MESSAGE_REJECT); PID("hmessage9"); return (-1); - default: + default: if ((msg & 0x80) && !(msg & 0x18)) { /* IDENTIFY */ PID("hmessage10"); ack_message(); diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index da9de238c84..6ff0fe41313 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.31 2005/05/01 17:04:52 martin Exp $ */ +/* $OpenBSD: nubus.c,v 1.32 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: nubus.c,v 1.53 2002/04/13 17:49:41 briggs Exp $ */ /* @@ -139,7 +139,7 @@ notfound: bus_space_unmap(bst, bsh, NBMEMSIZE); continue; } - + rsrcid = 0x80; lanes = fmtblock.bytelanes; diff --git a/sys/arch/mac68k/dev/nubus.h b/sys/arch/mac68k/dev/nubus.h index 670750c0d3e..eefdfa6255e 100644 --- a/sys/arch/mac68k/dev/nubus.h +++ b/sys/arch/mac68k/dev/nubus.h @@ -47,7 +47,7 @@ #define NUBUS_CATEGORY_BOARD 0x0001 #define NUBUS_TYPE_BOARD 0x0000 /* We want these for minimal board */ -#define NUBUS_DRSW_BOARD 0x0000 /* ROMs that come with nothing but */ +#define NUBUS_DRSW_BOARD 0x0000 /* ROMs that come with nothing but */ #define NUBUS_DRHW_BOARD 0x0000 /* a board resource (old NI_GPIB) */ #define NUBUS_CATEGORY_DISPLAY 0x0003 @@ -243,8 +243,8 @@ typedef struct _nubus_rsrc { } nubus_rsrc; /* - * On a NuBus master, an sMemory resource (this is a second-level - * resource list) holds a list of address ranges for onboard + * On a NuBus master, an sMemory resource (this is a second-level + * resource list) holds a list of address ranges for onboard * RAM, ROM and IO resources. */ typedef struct _nubus_smem_range { @@ -254,11 +254,11 @@ typedef struct _nubus_smem_range { /* * XXX This is mapped on the range list we get back out of the sMemory - * resources. I would have liked the range[] array to be of undefined + * resources. I would have liked the range[] array to be of undefined * size but the compiler does not let me. - * Maybe it's just too much grief, and we should work with an array + * Maybe it's just too much grief, and we should work with an array * of u_int32_t. - */ + */ typedef struct _nubus_smem_rangelist { u_int32_t length; nubus_smem_range range[1]; diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c index 3b9761dbae8..bd292ab0e99 100644 --- a/sys/arch/mac68k/dev/sbc_obio.c +++ b/sys/arch/mac68k/dev/sbc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc_obio.c,v 1.12 2005/07/23 23:28:58 martin Exp $ */ +/* $OpenBSD: sbc_obio.c,v 1.13 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $ */ /* @@ -119,7 +119,7 @@ sbc_obio_attach(parent, self, args) struct ncr5380_softc *ncr_sc = (struct ncr5380_softc *) sc; extern vaddr_t SCSIBase; - /* Pull in the options flags. */ + /* Pull in the options flags. */ sc->sc_options = ((ncr_sc->sc_dev.dv_cfdata->cf_flags | sbc_options) & SBC_OPTIONS_MASK); diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h index ca943c3e5f5..60391a282fd 100644 --- a/sys/arch/mac68k/dev/sbcvar.h +++ b/sys/arch/mac68k/dev/sbcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbcvar.h,v 1.6 2005/07/23 23:28:58 martin Exp $ */ +/* $OpenBSD: sbcvar.h,v 1.7 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $ */ /* @@ -95,7 +95,7 @@ struct sbc_softc { * * The options code is based on the sparc 'si' driver's version of * the same. - */ + */ #define SBC_PDMA 0x01 /* Use PDMA for polled transfers */ #define SBC_INTR 0x02 /* Allow SCSI IRQ/DRQ interrupts */ #define SBC_RESELECT 0x04 /* Allow disconnect/reselect */ diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c index e2bc82c2f67..c1fc0235e88 100644 --- a/sys/arch/mac68k/dev/z8530tty.c +++ b/sys/arch/mac68k/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.16 2004/11/25 18:32:10 miod Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.17 2006/04/14 09:36:49 martin Exp $ */ /* $NetBSD: z8530tty.c,v 1.14 1996/12/17 20:42:43 gwr Exp $ */ /* @@ -176,7 +176,7 @@ static void zsoverrun(struct zstty_softc *, long *, char *); /* * zstty_match: how is this zs channel configured? */ -int +int zstty_match(parent, match, aux) struct device *parent; void *match, *aux; @@ -195,7 +195,7 @@ zstty_match(parent, match, aux) return 0; } -void +void zstty_attach(parent, self, aux) struct device *parent, *self; void *aux; @@ -1144,7 +1144,7 @@ zstty_stint(cs) cs->cs_rr0_delta |= delta; cs->cs_rr0 = rr0; - /* + /* * Need to handle CTS output flow control here. * Output remains stopped as long as either the * zst_tx_stopped or TS_TTSTOP flag is set. |