aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/i2c.h2
-rw-r--r--hw/ide.c2
-rw-r--r--hw/pl011.c6
-rw-r--r--hw/pl181.c4
-rw-r--r--hw/rtl8139.c2
-rw-r--r--hw/usb.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/hw/i2c.h b/hw/i2c.h
index 17e52e7e80..9330ae8521 100644
--- a/hw/i2c.h
+++ b/hw/i2c.h
@@ -10,7 +10,7 @@ enum i2c_event {
I2C_START_RECV,
I2C_START_SEND,
I2C_FINISH,
- I2C_NACK /* Masker NACKed a recieve byte. */
+ I2C_NACK /* Masker NACKed a receive byte. */
};
typedef struct i2c_slave i2c_slave;
diff --git a/hw/ide.c b/hw/ide.c
index c4fabe6a64..9acb02a85e 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -1567,7 +1567,7 @@ static void ide_atapi_cmd(IDEState *s)
buf[1] = 0x80; /* removable */
buf[2] = 0x00; /* ISO */
buf[3] = 0x21; /* ATAPI-2 (XXX: put ATAPI-4 ?) */
- buf[4] = 31; /* additionnal length */
+ buf[4] = 31; /* additional length */
buf[5] = 0; /* reserved */
buf[6] = 0; /* reserved */
buf[7] = 0; /* reserved */
diff --git a/hw/pl011.c b/hw/pl011.c
index 64b753019d..149a85e540 100644
--- a/hw/pl011.c
+++ b/hw/pl011.c
@@ -176,7 +176,7 @@ static void pl011_write(void *opaque, target_phys_addr_t offset,
}
}
-static int pl011_can_recieve(void *opaque)
+static int pl011_can_receive(void *opaque)
{
pl011_state *s = (pl011_state *)opaque;
@@ -186,7 +186,7 @@ static int pl011_can_recieve(void *opaque)
return s->read_count < 1;
}
-static void pl011_recieve(void *opaque, const uint8_t *buf, int size)
+static void pl011_receive(void *opaque, const uint8_t *buf, int size)
{
pl011_state *s = (pl011_state *)opaque;
int slot;
@@ -241,7 +241,7 @@ void pl011_init(uint32_t base, qemu_irq irq,
s->cr = 0x300;
s->flags = 0x90;
if (chr){
- qemu_chr_add_handlers(chr, pl011_can_recieve, pl011_recieve,
+ qemu_chr_add_handlers(chr, pl011_can_receive, pl011_receive,
pl011_event, s);
}
/* ??? Save/restore. */
diff --git a/hw/pl181.c b/hw/pl181.c
index 912465971f..62ccad9e4e 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -160,7 +160,7 @@ static void pl181_send_command(pl181_state *s)
s->response[2] = RWORD(8);
s->response[3] = RWORD(12) & ~1;
}
- DPRINTF("Response recieved\n");
+ DPRINTF("Response received\n");
s->status |= PL181_STATUS_CMDRESPEND;
#undef RWORD
} else {
@@ -174,7 +174,7 @@ error:
s->status |= PL181_STATUS_CMDTIMEOUT;
}
-/* Transfer data between teh card and the FIFO. This is complicated by
+/* Transfer data between the card and the FIFO. This is complicated by
the FIFO holding 32-bit words and the card taking data in single byte
chunks. FIFO bytes are transferred in little-endian order. */
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index d1e60e8294..705bddb4eb 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -790,7 +790,7 @@ static int rtl8139_can_receive(void *opaque)
RTL8139State *s = opaque;
int avail;
- /* Recieve (drop) packets if card is disabled. */
+ /* Receive (drop) packets if card is disabled. */
if (!s->clock_enabled)
return 1;
if (!rtl8139_receiver_enabled(s))
diff --git a/hw/usb.c b/hw/usb.c
index efbc6dbe98..17cb8df367 100644
--- a/hw/usb.c
+++ b/hw/usb.c
@@ -140,7 +140,7 @@ int usb_generic_handle_packet(USBDevice *s, USBPacket *p)
s->setup_state = SETUP_STATE_IDLE;
/* transfer OK */
} else {
- /* ignore additionnal output */
+ /* ignore additional output */
}
break;
case SETUP_STATE_DATA: