diff options
| -rw-r--r-- | distrib/notes/amd64/hardware | 4 | ||||
| -rw-r--r-- | distrib/notes/cats/hardware | 4 | ||||
| -rw-r--r-- | distrib/notes/i386/hardware | 4 | ||||
| -rw-r--r-- | distrib/notes/macppc/hardware | 4 | ||||
| -rw-r--r-- | distrib/notes/sparc64/hardware | 4 | ||||
| -rw-r--r-- | share/man/man4/wi.4tbl | 6 | ||||
| -rw-r--r-- | usr.sbin/wsmoused/mouse_protocols.c | 10 |
7 files changed, 18 insertions, 18 deletions
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware index e17e9f7071f..8bdedbfeecf 100644 --- a/distrib/notes/amd64/hardware +++ b/distrib/notes/amd64/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.25 2004/12/02 01:58:25 pvalchev Exp $ +dnl $OpenBSD: hardware,v 1.26 2004/12/05 04:03:54 jsg Exp $ OpenBSD/MACHINE OSREV should work on all Athlon 64-based and compatible designs. @@ -433,7 +433,7 @@ dnl US Robotics 2445 PCMCIA Linksys WUSB11 v3.0 Linksys WUSB12 Melco WLI-USB-KS11G - MicroSoft MN510 + Microsoft MN510 Netgear MA111 Siemens SpeedStream SS1022 Syntax USB-400 diff --git a/distrib/notes/cats/hardware b/distrib/notes/cats/hardware index 8c67955d167..8b6e601444a 100644 --- a/distrib/notes/cats/hardware +++ b/distrib/notes/cats/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.11 2004/11/21 18:48:10 grange Exp $ +dnl $OpenBSD: hardware,v 1.12 2004/12/05 04:03:54 jsg Exp $ OpenBSD/MACHINE runs on the Chalice/Simtec StrongARM 110 Evaluation Board. Supported devices {:-include-:}: @@ -156,7 +156,7 @@ Supported devices {:-include-:}: Linksys WUSB11 v3.0 Linksys WUSB12 Melco WLI-USB-KS11G - MicroSoft MN510 + Microsoft MN510 Netgear MA111 Siemens SpeedStream SS1022 Syntax USB-400 diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware index df58ec424e9..7a777b67125 100644 --- a/distrib/notes/i386/hardware +++ b/distrib/notes/i386/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.170 2004/12/01 01:46:45 pvalchev Exp $ +dnl $OpenBSD: hardware,v 1.171 2004/12/05 04:03:54 jsg Exp $ OpenBSD/MACHINE OSREV works across a broad range of standard PCs and clones, with a wide variety of processors and I/O bus architectures. It can be expected to install and run with minimal difficulties on most @@ -532,7 +532,7 @@ Supported hardware {:-include-:}: Linksys WUSB11 v3.0 Linksys WUSB12 Melco WLI-USB-KS11G - MicroSoft MN510 + Microsoft MN510 Netgear MA111 Siemens SpeedStream SS1022 Syntax USB-400 diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware index efea3ff4946..a13d893d434 100644 --- a/distrib/notes/macppc/hardware +++ b/distrib/notes/macppc/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.40 2004/10/29 11:45:01 jsg Exp $ +dnl $OpenBSD: hardware,v 1.41 2004/12/05 04:03:54 jsg Exp $ OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, and G4 Cube, as well as PowerBook and iBook machines. @@ -138,7 +138,7 @@ Supported devices {:-include-:}: Linksys WUSB11 v3.0 Linksys WUSB12 Melco WLI-USB-KS11G - MicroSoft MN510 + Microsoft MN510 Netgear MA111 Siemens SpeedStream SS1022 Syntax USB-400 diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware index d6d286bff86..2008fdc5838 100644 --- a/distrib/notes/sparc64/hardware +++ b/distrib/notes/sparc64/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.76 2004/11/29 18:12:48 miod Exp $ +dnl $OpenBSD: hardware,v 1.77 2004/12/05 04:03:54 jsg Exp $ OpenBSD/MACHINE OSREV runs on the following classes of machines: - SBUS based workstations: Ultra 1 @@ -235,7 +235,7 @@ dnl PCI Alteon Tigon I/II PCI Gigabit Ethernet boards (ti) Linksys WUSB11 v3.0 Linksys WUSB12 Melco WLI-USB-KS11G - MicroSoft MN510 + Microsoft MN510 Netgear MA111 Siemens SpeedStream SS1022 Syntax USB-400 diff --git a/share/man/man4/wi.4tbl b/share/man/man4/wi.4tbl index b81c472bcd2..b706c9fac46 100644 --- a/share/man/man4/wi.4tbl +++ b/share/man/man4/wi.4tbl @@ -1,4 +1,4 @@ -.\" $OpenBSD: wi.4tbl,v 1.63 2004/11/23 12:37:36 naddy Exp $ +.\" $OpenBSD: wi.4tbl,v 1.64 2004/12/05 04:03:53 jsg Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -190,8 +190,8 @@ Linksys WUSB12:Prism-3:USB Longshine 8301:Prism-2:PCI Lucent WaveLAN:Hermes:PCMCIA Melco WLI-USB-KS11G:Prism-3:USB -MicroSoft MN510:Prism-3:USB -MicroSoft MN520:Prism-2.5:PCMCIA +Microsoft MN510:Prism-3:USB +Microsoft MN520:Prism-2.5:PCMCIA NANOSPEED ROOT-RZ2000:Prism-2:PCMCIA NDC/Sohoware NCP130:Prism-2:PCI NEC CMZ-RT-WP:Prism-2:PCMCIA diff --git a/usr.sbin/wsmoused/mouse_protocols.c b/usr.sbin/wsmoused/mouse_protocols.c index 1297da9936e..157a00663d5 100644 --- a/usr.sbin/wsmoused/mouse_protocols.c +++ b/usr.sbin/wsmoused/mouse_protocols.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse_protocols.c,v 1.9 2004/11/29 06:20:02 jsg Exp $ */ +/* $OpenBSD: mouse_protocols.c,v 1.10 2004/12/05 04:03:53 jsg Exp $ */ /* * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon @@ -90,7 +90,7 @@ extern mouse_t mouse; /* Cflags of each mouse protocol, ordered by P_XXX */ static unsigned short mousecflags[] = { - (CS7 | CREAD | CLOCAL | HUPCL), /* MicroSoft */ + (CS7 | CREAD | CLOCAL | HUPCL), /* Microsoft */ (CS8 | CSTOPB | CREAD | CLOCAL | HUPCL), /* MouseSystems */ (CS8 | CSTOPB | CREAD | CLOCAL | HUPCL), /* Logitech */ (CS8 | PARENB | PARODD | CREAD | CLOCAL | HUPCL), /* MMSeries */ @@ -104,7 +104,7 @@ static unsigned short mousecflags[] = { /* array ordered by P_XXX giving protocol properties */ static unsigned char proto[][7] = { /* mask hd_id dp_mask dp_id bytes b4_mask b4_id */ - {0x40, 0x40, 0x40, 0x00, 3, ~0x23, 0x00}, /* MicroSoft */ + {0x40, 0x40, 0x40, 0x00, 3, ~0x23, 0x00}, /* Microsoft */ {0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff}, /* MouseSystems */ {0xe0, 0x80, 0x80, 0x00, 3, 0x00, 0xff}, /* Logitech */ {0xe0, 0x80, 0x80, 0x00, 3, 0x00, 0xff}, /* MMSeries */ @@ -640,9 +640,9 @@ mouse_init(void) ** The protocols supported by the (European) MouseMan are: ** - 5 byte packed binary protocol, as with the Mouse Systems ** mouse. Selected by sequence "*U". - ** - 2 button 3 byte MicroSoft compatible protocol. Selected + ** - 2 button 3 byte Microsoft compatible protocol. Selected ** by sequence "*V". - ** - 3 button 3+1 byte MicroSoft compatible protocol (default). + ** - 3 button 3+1 byte Microsoft compatible protocol (default). ** Selected by sequence "*X". ** ** The following baud rates are supported: |