summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-03-02 07:15:46 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-03-02 07:15:46 +0000
commit3aabb2b7e5326f7212c49ebd28ad5a7cdaf60875 (patch)
treea417e5853ef8423f63679772574f38156055752f
parentfcbab318f4d9fb0f0bbfdda6f18afbe4aeda3b4f (diff)
- change recieved -> received in comments, as well as two unused defines
in pxe.h. ok deraadt@ sthen@
-rw-r--r--sys/arch/amd64/stand/libsa/pxe.h6
-rw-r--r--sys/arch/i386/stand/libsa/pxe.h6
-rw-r--r--sys/dev/pci/drm/drmP.h2
-rw-r--r--sys/dev/usb/utwitch.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/amd64/stand/libsa/pxe.h b/sys/arch/amd64/stand/libsa/pxe.h
index ba77d4851e9..6d15f2a9a05 100644
--- a/sys/arch/amd64/stand/libsa/pxe.h
+++ b/sys/arch/amd64/stand/libsa/pxe.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxe.h,v 1.5 2010/11/20 20:11:19 miod Exp $ */
+/* $OpenBSD: pxe.h,v 1.6 2011/03/02 07:15:45 jasper Exp $ */
/* $NetBSD: pxe.h,v 1.1 2002/02/16 03:37:40 thorpej Exp $ */
/*
@@ -330,7 +330,7 @@ typedef struct {
PXENV_STATUS_t Status;
uint16_t FuncFlag; /* PXENV_UNDI_ISR_OUT_xxx */
uint16_t BufferLength; /* Length of Frame */
- uint16_t FrameLength; /* Total length of reciever
+ uint16_t FrameLength; /* Total length of receiver
frame */
uint16_t FrameHeaderLength; /* Length of the media header
in Frame */
@@ -351,7 +351,7 @@ typedef struct {
*/
# define PXENV_UNDI_ISR_OUT_DONE 0
# define PXENV_UNDI_ISR_OUT_TRANSMIT 2
-# define PXENV_UNDI_ISR_OUT_RECIEVE 3
+# define PXENV_UNDI_ISR_OUT_RECEIVE 3
# define PXENV_UNDI_ISR_OUT_BUSY 4
} __packed t_PXENV_UNDI_ISR;
diff --git a/sys/arch/i386/stand/libsa/pxe.h b/sys/arch/i386/stand/libsa/pxe.h
index ba77d4851e9..6d15f2a9a05 100644
--- a/sys/arch/i386/stand/libsa/pxe.h
+++ b/sys/arch/i386/stand/libsa/pxe.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxe.h,v 1.5 2010/11/20 20:11:19 miod Exp $ */
+/* $OpenBSD: pxe.h,v 1.6 2011/03/02 07:15:45 jasper Exp $ */
/* $NetBSD: pxe.h,v 1.1 2002/02/16 03:37:40 thorpej Exp $ */
/*
@@ -330,7 +330,7 @@ typedef struct {
PXENV_STATUS_t Status;
uint16_t FuncFlag; /* PXENV_UNDI_ISR_OUT_xxx */
uint16_t BufferLength; /* Length of Frame */
- uint16_t FrameLength; /* Total length of reciever
+ uint16_t FrameLength; /* Total length of receiver
frame */
uint16_t FrameHeaderLength; /* Length of the media header
in Frame */
@@ -351,7 +351,7 @@ typedef struct {
*/
# define PXENV_UNDI_ISR_OUT_DONE 0
# define PXENV_UNDI_ISR_OUT_TRANSMIT 2
-# define PXENV_UNDI_ISR_OUT_RECIEVE 3
+# define PXENV_UNDI_ISR_OUT_RECEIVE 3
# define PXENV_UNDI_ISR_OUT_BUSY 4
} __packed t_PXENV_UNDI_ISR;
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 777cdf56193..1d501136be2 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -324,7 +324,7 @@ struct drm_vblank_info {
u_int32_t vb_max; /* counter reg size */
struct drm_vblank {
struct drmevlist vbl_events; /* vblank events */
- u_int32_t vbl_last; /* Last recieved */
+ u_int32_t vbl_last; /* Last received */
u_int32_t vbl_count; /* interrupt no. */
int vbl_refs; /* Number of users */
int vbl_enabled; /* Enabled? */
diff --git a/sys/dev/usb/utwitch.c b/sys/dev/usb/utwitch.c
index 99e4f8fcaeb..fbbc84e60eb 100644
--- a/sys/dev/usb/utwitch.c
+++ b/sys/dev/usb/utwitch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utwitch.c,v 1.3 2011/01/25 20:03:36 jakemsr Exp $ */
+/* $OpenBSD: utwitch.c,v 1.4 2011/03/02 07:15:45 jasper Exp $ */
/*
* Copyright (c) 2010 Yojiro UO <yuo@nui.org>
@@ -245,7 +245,7 @@ utwitch_intr(struct uhidev *addr, void *ibuf, u_int len)
switch (buf[0]) {
case CMD_ACK:
if (buf[1] == sc->issueing_cmd) {
- DPRINTF(("ack recieved for cmd 0x%.2x\n", buf[1]));
+ DPRINTF(("ack received for cmd 0x%.2x\n", buf[1]));
sc->accepted_cmd = buf[1];
} else {
DPRINTF(("cmd-ack mismatch: recved 0x%.2x, expect 0x%.2x\n",