diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pcmcia/if_awi_pcmcia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_ray.c | 32 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_rayreg.h | 10 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_xe.c | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_xereg.h | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia_cis.c | 7 |
6 files changed, 31 insertions, 30 deletions
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c index ba576b3ffd3..c9fe377af7b 100644 --- a/sys/dev/pcmcia/if_awi_pcmcia.c +++ b/sys/dev/pcmcia/if_awi_pcmcia.c @@ -1,5 +1,5 @@ /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */ -/* $OpenBSD: if_awi_pcmcia.c,v 1.11 2002/09/15 22:18:11 deraadt Exp $ */ +/* $OpenBSD: if_awi_pcmcia.c,v 1.12 2003/10/22 09:58:46 jmc Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ * PCMCIA attachment for BayStack 650 802.11FH PCMCIA card, * based on the AMD 79c930 802.11 controller chip. * - * This attachment can probably be trivally adapted for other FH and + * This attachment can probably be trivially adapted for other FH and * DS cards based on the same chipset. */ diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index ddfd0b899f0..e2890e0ac6c 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ray.c,v 1.21 2002/11/19 18:36:18 jason Exp $ */ +/* $OpenBSD: if_ray.c,v 1.22 2003/10/22 09:58:46 jmc Exp $ */ /* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */ /* @@ -151,9 +151,9 @@ #endif /* - * the number of times the HW is reset in 30s before disabling - * this is needed becuase resets take ~2s and currently pcmcia - * spins for the reset + * The number of times the HW is reset in 30s before disabling. + * This is needed because resets take ~2s and currently pcmcia + * spins for the reset. */ #ifndef RAY_MAX_RESETS #define RAY_MAX_RESETS 10 @@ -1907,7 +1907,7 @@ ray_check_ccs(arg) breakout: /* see if we got one of the commands we are looking for */ if (i > RAY_CCS_CMD_LAST) - ; /* nothign */ + ; /* nothing */ else if (stat == RAY_CCS_STATUS_FREE) { stat = RAY_CCS_STATUS_COMPLETE; if ((fp = ray_ccs_done(sc, ccs))) @@ -1936,7 +1936,7 @@ breakout: * to keep the values from being changed while read: It checks * the `own' bit and if zero writes the current internal counter * value, it then sets the `own' bit to 1. If the `own' bit was 1 it - * incremenets its internal counter. The user thus reads the counter + * increments its internal counter. The user thus reads the counter * if the `own' bit is one and then sets the own bit to 0. */ void @@ -2069,7 +2069,7 @@ done: } /* - * an unsolicted interrupt, i.e., the ECF is sending us a command + * an unsolicited interrupt, i.e., the ECF is sending us a command */ ray_cmd_func_t ray_rccs_intr(sc, ccs) @@ -2088,7 +2088,7 @@ ray_rccs_intr(sc, ccs) rcmd = 0; switch (cmd) { /* - * unsolicted commands + * unsolicited commands */ case RAY_ECMD_RX_DONE: ray_recv(sc, ccs); @@ -2300,7 +2300,7 @@ ray_cmd_schedule(sc, cmdf) if ((cmdf & SCP_UPD_MASK) == 0) ray_set_pending(sc, track); else if (ray_cmd_is_running(sc, SCP_UPDATESUBCMD)) { - /* don't do timeout mechaniscm if subcmd already going */ + /* don't do timeout mechanism if subcmd already going */ sc->sc_scheduled |= cmdf; } else ray_set_pending(sc, cmdf | SCP_UPDATESUBCMD); @@ -2474,7 +2474,7 @@ ray_update_subcmd(sc) if (!RAY_ECF_READY(sc)) break; /* - * give priority to LSB -- e.g., if previous loop reschuled + * give priority to LSB -- e.g., if previous loop rescheduled * doing this command after calling the function won't catch * if a later command sets an earlier bit */ @@ -2645,7 +2645,7 @@ ray_download_params(sc) sp->sp_promisc = sc->sc_promisc; PUT2(sp->sp_uniq_word, 0x0cbd); if (sc->sc_version == SC_BUILD_4) { - /* XXX whats this value anyway.. the std says 50us */ + /* XXX what's this value anyway... the std says 50us */ /* XXX sp->sp_slot_time = 0x4e; */ sp->sp_slot_time = 0x4e; #if 1 @@ -3013,13 +3013,13 @@ ray_update_mcast(sc) } /* - * User issued commands + * User-issued commands */ /* - * issue a update params + * issue an "update params" * - * expected to be called in sleapable context -- intended for user stuff + * expected to be called in sleepable context -- intended for user stuff */ int ray_user_update_params(sc, pr) @@ -3059,9 +3059,9 @@ ray_user_update_params(sc, pr) } /* - * issue a report params + * issue a "report params" * - * expected to be called in sleapable context -- intended for user stuff + * expected to be called in sleepable context -- intended for user stuff */ int ray_user_report_params(sc, pr) diff --git a/sys/dev/pcmcia/if_rayreg.h b/sys/dev/pcmcia/if_rayreg.h index 7ed3cd9a448..0de819f9cc4 100644 --- a/sys/dev/pcmcia/if_rayreg.h +++ b/sys/dev/pcmcia/if_rayreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rayreg.h,v 1.5 2002/03/24 20:53:56 mickey Exp $ */ +/* $OpenBSD: if_rayreg.h,v 1.6 2003/10/22 09:58:46 jmc Exp $ */ /* $NetBSD: if_rayreg.h,v 1.3 2000/08/10 11:48:46 ad Exp $ */ /* @@ -175,7 +175,7 @@ struct ray_csc { u_int16_t csc_mrx_overflow; /* ECF incs on rx overflow */ u_int16_t csc_mrx_cksum; /* " on cksum error */ u_int16_t csc_rx_hcksum; /* " on header cksum error */ - u_int8_t csc_rx_noise; /* average RSL measuremant */ + u_int8_t csc_rx_noise; /* average RSL measurement */ }; /* status area */ @@ -388,11 +388,11 @@ struct ray_startup_params_tail_4 { #define RAY_CMD_MAX 0x0e /* - * unsolicted commands from the ECF + * unsolicited commands from the ECF */ #define RAY_ECMD_RX_DONE 0x80 /* process rx packet */ #define RAY_ECMD_REJOIN_DONE 0x81 /* rejoined the network */ -#define RAY_ECMD_ROAM_START 0x82 /* romaining started */ +#define RAY_ECMD_ROAM_START 0x82 /* roaming started */ #define RAY_ECMD_JAPAN_CALL_SIGNAL 0x83 /* japan test thing */ @@ -502,7 +502,7 @@ struct ray_cmd_tx { u_int8_t c_antenna; }; -/* RAY_CMD_TX_REQ (for bulid 4) */ +/* RAY_CMD_TX_REQ (for build 4) */ struct ray_cmd_tx_4 { u_int8_t c_status; /* ccs generic header */ u_int8_t c_cmd; /* " */ diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index 87eda3fa4b2..2042fd478b1 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.25 2003/02/11 19:20:28 mickey Exp $ */ +/* $OpenBSD: if_xe.c,v 1.26 2003/10/22 09:58:46 jmc Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -327,7 +327,7 @@ xe_pcmcia_attach(parent, self, aux) sc->sc_flags = xe_pcmcia_interpret_manfid(parent); /* - * Configuration as adviced by DINGO documentation. + * Configuration as advised by DINGO documentation. * We only know about this flag after the manfid interpretation. * Dingo has some extra configuration registers in the CCR space. */ diff --git a/sys/dev/pcmcia/if_xereg.h b/sys/dev/pcmcia/if_xereg.h index 8584366bb01..8101873142e 100644 --- a/sys/dev/pcmcia/if_xereg.h +++ b/sys/dev/pcmcia/if_xereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xereg.h,v 1.3 2001/06/27 05:44:57 nate Exp $ */ +/* $OpenBSD: if_xereg.h,v 1.4 2003/10/22 09:58:46 jmc Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, C Stone, Job de Haas @@ -79,7 +79,7 @@ #define ESR 0x0 /* R - Ethernet status register */ #define PR 0x1 /* RW - Page register select */ #define EDP 0x4 /* RW - Ethernet data port, 4 registers */ -#define ISR0 0x6 /* R - Etherenet interrupt status register */ +#define ISR0 0x6 /* R - Ethernet interrupt status register */ #define GIR 0x7 /* RW - Global interrupt register */ #define PTR 0xd /* R - Packets Transmitted register */ diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c index 65ebc8fcea7..f8999e644c7 100644 --- a/sys/dev/pcmcia/pcmcia_cis.c +++ b/sys/dev/pcmcia/pcmcia_cis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia_cis.c,v 1.10 2003/05/06 11:22:30 henning Exp $ */ +/* $OpenBSD: pcmcia_cis.c,v 1.11 2003/10/22 09:58:46 jmc Exp $ */ /* $NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $ */ /* @@ -1014,8 +1014,9 @@ pcmcia_parse_cis_tuple(tuple, arg) idx++; /* * until - * non-extensi - * on byte + * non- + * extension + * byte */ } while (reg2 & 0x80); } |