diff --git a/block-raw.c b/block-raw.c index 29882e1f70da3f5a32a207cf97a884864f1598f2..e9e50276833cfb7d580079a59116a9b9c99b11fb 100644 --- a/block-raw.c +++ b/block-raw.c @@ -1295,7 +1295,7 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags) #if 0 /***********************************************/ -/* removable device additionnal commands */ +/* removable device additional commands */ static int raw_is_inserted(BlockDriverState *bs) { diff --git a/dis-asm.h b/dis-asm.h index 2b2f1d1decfd4fc2f2e72f097cf474d7c7ea36d6..ad08cc5d6cc383fd2331f1f62937a44f52d99c3a 100644 --- a/dis-asm.h +++ b/dis-asm.h @@ -421,7 +421,7 @@ extern int generic_symbol_at_address /* Call this macro to initialize only the internal variables for the disassembler. Architecture dependent things such as byte order, or machine variant are not touched by this macro. This makes things much easier for - GDB which must initialize these things seperatly. */ + GDB which must initialize these things separately. */ #define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \ (INFO).fprintf_func = (FPRINTF_FUNC), \ diff --git a/gdbstub.c b/gdbstub.c index 06cf30200ce371ddb9c791877eb4c3341d1a1b39..2ac8c5712a1a802dc458533d1832a381dbf28548 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1248,12 +1248,12 @@ int gdbserver_start(int port) return 0; } #else -static int gdb_chr_can_recieve(void *opaque) +static int gdb_chr_can_receive(void *opaque) { return 1; } -static void gdb_chr_recieve(void *opaque, const uint8_t *buf, int size) +static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size) { GDBState *s = opaque; int i; @@ -1304,7 +1304,7 @@ int gdbserver_start(const char *port) } s->env = first_cpu; /* XXX: allow to change CPU */ s->chr = chr; - qemu_chr_add_handlers(chr, gdb_chr_can_recieve, gdb_chr_recieve, + qemu_chr_add_handlers(chr, gdb_chr_can_receive, gdb_chr_receive, gdb_chr_event, s); qemu_add_vm_stop_handler(gdb_vm_stopped, s); return 0; diff --git a/hw/i2c.h b/hw/i2c.h index 17e52e7e80f8e6b21d74425755832bc4727f2270..9330ae8521b29052151c2855671b262a6192af9d 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 c4fabe6a6445513bfb6b0587c31334b26740ff53..9acb02a85e2c9aed319c4c8d3cde9f1510978477 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 64b753019d56cf7ab8b60881608c0e0463577d5b..149a85e5404d62e9974b7ea28456e7aa133b61d3 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 912465971f04c4bb558f87c134538c3c1c346a88..62ccad9e4e3fad0c1bb723b7493f6760688eee58 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 d1e60e8294124ee3d5001aab85c725d032d67dd0..705bddb4ebb8a53cb18e7ed1968f879d56ec4be0 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 efbc6dbe9864c2c376e6a49c0d72917648c9beac..17cb8df3677cef7000319e49e898fc794e1966aa 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: diff --git a/linux-user/signal.c b/linux-user/signal.c index 5b1334a1cef2cc3d8af975a0e386b1bbd01762b8..6dcb9dc530f02ff147fe707e6b14e720dd4221a6 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -244,7 +244,7 @@ void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info) } /* XXX: we support only POSIX RT signals are used. */ -/* XXX: find a solution for 64 bit (additionnal malloced data is needed) */ +/* XXX: find a solution for 64 bit (additional malloced data is needed) */ void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo) { info->si_signo = tswap32(tinfo->si_signo); diff --git a/m68k-dis.c b/m68k-dis.c index dd195582e6da9ca1dcd2125690b9a0c6339c9c69..ef0f89c744a1846f69c44f903feaa9aea3a219cb 100644 --- a/m68k-dis.c +++ b/m68k-dis.c @@ -560,7 +560,7 @@ static char *const reg_names[] = }; /* Name of register halves for MAC/EMAC. - Seperate from reg_names since 'spu', 'fpl' look weird. */ + Separate from reg_names since 'spu', 'fpl' look weird. */ static char *const reg_half_names[] = { "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7", diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 3a82426b8dc6d01cf0093b9a4699730ff43f9abc..6d764f535309776fa50c6df4e73ac77e892722b0 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -121,7 +121,7 @@ #define VIP_MASK 0x00100000 #define ID_MASK 0x00200000 -/* hidden flags - used internally by qemu to represent additionnal cpu +/* hidden flags - used internally by qemu to represent additional cpu states. Only the CPL, INHIBIT_IRQ and HALTED are not redundant. We avoid using the IOPL_MASK, TF_MASK and VM_MASK bit position to ease oring with eflags. */