From 96e2c50befd21d1dea6407242c483cfa194328d2 Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Mon, 9 Dec 2019 16:29:23 +0000 Subject: [PATCH] applying SF patch #545 Speling fixes --- bochs/.bochsrc | 6 +++--- bochs/CHANGES | 10 +++++----- bochs/bx_debug/dbg_main.cc | 8 ++++---- bochs/bx_debug/parser.y | 2 +- bochs/config.cc | 8 ++++---- bochs/cpu/cpu.cc | 2 +- bochs/cpu/debugstuff.cc | 2 +- bochs/cpu/fpu/ferr.cc | 4 ++-- bochs/cpu/msr.cc | 2 +- bochs/cpu/paging.cc | 2 +- bochs/cpu/protect_ctrl.cc | 4 ++-- bochs/doc/docbook/development/development.dbk | 20 +++++++++---------- bochs/doc/docbook/user/user.dbk | 8 ++++---- bochs/doc/man/bochsrc.5 | 6 +++--- bochs/gui/enh_dbg.cc | 2 +- bochs/gui/term.cc | 2 +- bochs/iodev/cmos.cc | 2 +- bochs/iodev/display/vga.cc | 2 +- bochs/iodev/harddrv.cc | 2 +- bochs/iodev/network/eth_socket.cc | 4 ++-- bochs/iodev/sound/sb16.cc | 2 +- bochs/iodev/sound/sb16.h | 4 ++-- bochs/iodev/usb/scsi_device.cc | 2 +- bochs/iodev/usb/uhci_core.cc | 8 ++++---- bochs/misc/make_cmos_image.cc | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/bochs/.bochsrc b/bochs/.bochsrc index cc94a12c6..9e5941691 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -159,7 +159,7 @@ # IGNORE_BAD_MSRS: # Ignore MSR references that Bochs does not understand; print a warning # message instead of generating #GP exception. This option is enabled -# by default but will not be avaiable if configurable MSRs are enabled. +# by default but will not be available if configurable MSRs are enabled. # # MWAIT_IS_NOP: # When this option is enabled MWAIT will not put the CPU into a sleep state. @@ -435,7 +435,7 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest # This defines the Voodoo Graphics emulation (experimental). Currently # supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The # Voodoo2 support is not yet complete, but almost usable. The Banshee and -# Voodoo3 support is under construction, but basicly usable. The 2D/3D cards +# Voodoo3 support is under construction, but basically usable. The 2D/3D cards # require an external VGA BIOS the vga extension option to be set to 'voodoo'. # If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5). # The gui screen update timing for all models is controlled by the related 'vga' @@ -1118,7 +1118,7 @@ speaker: enabled=1, mode=sound # The optionsX parameter can be used to assign specific options to the device # connected to the corresponding USB port. Currently this feature is used to # set the speed reported by device ('low', 'full', 'high' or 'super'). The -# availabe speed choices depend on both HC and device. The option 'debug' turns +# available speed choices depend on both HC and device. The option 'debug' turns # on debug output for the device at connection time. # For the USB 'disk' device the optionsX parameter can be used to specify an # alternative redolog file (journal) of some image modes. For 'vvfat' mode USB diff --git a/bochs/CHANGES b/bochs/CHANGES index b06bdda43..e805a4027 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -53,7 +53,7 @@ Detailed change log : - Voodoo2 model now working after some fixes and implementation of the CMDFIFO (using FIFO thread) and one of the bitBLT functions. - Added Voodoo Banshee / Voodoo3 emulation support (still under construction, - but basicly usable). The AGP models are available if chipset is i440BX. + but basically usable). The AGP models are available if chipset is i440BX. - Display (general) - Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee / Voodoo3 adapters (reporting plug&play monitor "Bochs Screen"). @@ -1103,7 +1103,7 @@ Detailed change log : [2905385] Bochs crash [2901481] Instruction SYSRET and SS(PL) [2900632] Broken long mode RETF to outer priviledge with null SS - [1429011] Use bx_phyaddr_t for physaddr vars and bx_adress for lin adr + [1429011] Use bx_phyaddr_t for physaddr vars and bx_address for lin adr - these S.F. feature requests were closed/implemented [2955911] RPM preuninstall scriptlet removes /core @@ -2010,7 +2010,7 @@ Detailed change log : - CPU - fixed XMM registers restore in FXRSTOR instruction (Andrej Palkovsky) - - print registers dump to the log if tripple fault occured + - print registers dump to the log if tripple fault occurred - fixed PANIC in LTR instruction (Stanislav) - added virtual 8086 mode extensions (VME) implementation, to enable configure with --enable-vme (Stanislav) @@ -2528,7 +2528,7 @@ Detailed change log : #1112836 PGE-Bit crashes Bochs #947586 The specification difference in x86-64 emulation #1117145 Push reset Button, APIC0 Error occur - #1123043 fpu stack pointer changed *despite* fault occured (e.g. #pf) + #1123043 fpu stack pointer changed *despite* fault occurred (e.g. #pf) #1122066 PANIC: iret: IP > descriptor limit when installing os/2 warp #809574 rm -f segfaults #593952 SuSE rm segfaults @@ -2706,7 +2706,7 @@ Changes in 2.1.1 (February 8, 2004): - notify display libraries on change of bpp (Volker) - fix bug in int13h function 0x10 (Volker) - fix floppy dialog error on win2k (Volker) -- fix adress check in TSS IO permission bitmap (Christophe) +- fix address check in TSS IO permission bitmap (Christophe) - fix buffer overflow vulnerability pointed out by SeSoX (Christophe) - updates for MacOS compile (Daniel Gimpelevich) diff --git a/bochs/bx_debug/dbg_main.cc b/bochs/bx_debug/dbg_main.cc index 3aabb416f..ceb9b81f0 100644 --- a/bochs/bx_debug/dbg_main.cc +++ b/bochs/bx_debug/dbg_main.cc @@ -561,11 +561,11 @@ void bx_dbg_exception(unsigned cpu, Bit8u vector, Bit16u error_code) if (BX_CPU(dbg_cpu)->trace || bx_dbg.exceptions) { if (vector <= BX_XM_EXCEPTION) { - dbg_printf("CPU %d: Exception 0x%02x - %s occured (error_code=0x%04x)\n", + dbg_printf("CPU %d: Exception 0x%02x - %s occurred (error_code=0x%04x)\n", cpu, vector, exception[vector], error_code); } else { - dbg_printf("CPU %d: Exception 0x%02x occured (error_code=0x%04x)\n", + dbg_printf("CPU %d: Exception 0x%02x occurred (error_code=0x%04x)\n", cpu, vector, error_code); } } @@ -575,7 +575,7 @@ void bx_dbg_interrupt(unsigned cpu, Bit8u vector, Bit16u error_code) { if (BX_CPU(dbg_cpu)->trace || bx_dbg.interrupts) { - dbg_printf("CPU %d: Interrupt 0x%02x occured (error_code=0x%04x)\n", + dbg_printf("CPU %d: Interrupt 0x%02x occurred (error_code=0x%04x)\n", cpu, vector, error_code); } } @@ -2781,7 +2781,7 @@ void bx_dbg_restore_command(const char *param_name, const char *restore_path) dbg_printf("restoring param (%s) state from file (%s/%s)\n", param_name, path, param_name); if (! SIM->restore_bochs_param(SIM->get_bochs_root(), path, param_name)) { - dbg_printf("Error: error occured during restore\n"); + dbg_printf("Error: error occurred during restore\n"); } else { bx_sr_after_restore_state(); diff --git a/bochs/bx_debug/parser.y b/bochs/bx_debug/parser.y index 14addf9ce..7c3411671 100644 --- a/bochs/bx_debug/parser.y +++ b/bochs/bx_debug/parser.y @@ -1087,7 +1087,7 @@ help_command: } | BX_TOKEN_HELP BX_TOKEN_TRACEMEM '\n' { - dbg_printf("trace-mem on - print all memory accesses occured during instruction execution\n"); + dbg_printf("trace-mem on - print all memory accesses occurred during instruction execution\n"); dbg_printf("trace-mem off - disable memory accesses tracing\n"); free($1);free($2); } diff --git a/bochs/config.cc b/bochs/config.cc index 4ed7af366..727da63a3 100644 --- a/bochs/config.cc +++ b/bochs/config.cc @@ -429,7 +429,7 @@ void bx_init_options() #endif new bx_param_bool_c(cpu_param, "reset_on_triple_fault", "Enable CPU reset on triple fault", - "Enable CPU reset if triple fault occured (highly recommended)", + "Enable CPU reset if triple fault occurred (highly recommended)", 1); #if BX_CPU_LEVEL >= 5 new bx_param_bool_c(cpu_param, @@ -1021,7 +1021,7 @@ void bx_init_options() 250); new bx_param_num_c(keyboard, "paste_delay", "Keyboard paste delay", - "Approximate time in microseconds between attemps to paste characters to the keyboard controller.", + "Approximate time in microseconds between attempts to paste characters to the keyboard controller.", 1000, BX_MAX_BIT32U, 100000); bx_param_bool_c *use_kbd_mapping = new bx_param_bool_c(keyboard, @@ -1289,7 +1289,7 @@ void bx_init_options() ioaddr = new bx_param_num_c(ata_res[channel], "ioaddr1", "I/O Address 1", - "IO adress of ata command block", + "IO address of ata command block", 0, 0xffff, ata_default_ioaddr1[channel]); ioaddr->set_base(16); @@ -1298,7 +1298,7 @@ void bx_init_options() ioaddr2 = new bx_param_num_c(ata_res[channel], "ioaddr2", "I/O Address 2", - "IO adress of ata control block", + "IO address of ata control block", 0, 0xffff, ata_default_ioaddr2[channel]); ioaddr2->set_base(16); diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc index 7fd48c4c5..e5280842f 100644 --- a/bochs/cpu/cpu.cc +++ b/bochs/cpu/cpu.cc @@ -575,7 +575,7 @@ void BX_CPU_C::prefetch(void) if (EIP == (Bit32u) BX_CPU_THIS_PTR prev_rip) { Bit32u dr6_bits = code_breakpoint_match(laddr); if (dr6_bits & BX_DEBUG_TRAP_HIT) { - BX_ERROR(("#DB: x86 code breakpoint catched")); + BX_ERROR(("#DB: x86 code breakpoint caught")); BX_CPU_THIS_PTR debug_trap |= dr6_bits; exception(BX_DB_EXCEPTION, 0); } diff --git a/bochs/cpu/debugstuff.cc b/bochs/cpu/debugstuff.cc index 8df241c37..65239a433 100644 --- a/bochs/cpu/debugstuff.cc +++ b/bochs/cpu/debugstuff.cc @@ -98,7 +98,7 @@ const char* cpu_state_string(unsigned state) "in shutdown", "waiting for SIPI", "executing mwait", - "executing mwait inhibit interrups", + "executing mwait inhibit interrupts", "unknown state" }; diff --git a/bochs/cpu/fpu/ferr.cc b/bochs/cpu/fpu/ferr.cc index 38a654be8..1ba1b0384 100644 --- a/bochs/cpu/fpu/ferr.cc +++ b/bochs/cpu/fpu/ferr.cc @@ -53,7 +53,7 @@ void BX_CPU_C::FPU_stack_underflow(bxInstruction_c *i, int stnr, int pop_stack) FPU_exception(i, FPU_EX_Stack_Underflow); } -/* Returns unmasked exceptions if occured */ +/* Returns unmasked exceptions if occurred */ unsigned BX_CPU_C::FPU_exception(bxInstruction_c *i, unsigned exception, bx_bool is_store) { /* Extract only the bits which we use to set the status word */ @@ -119,7 +119,7 @@ unsigned BX_CPU_C::FPU_exception(bxInstruction_c *i, unsigned exception, bx_bool } } - // If #P unmasked exception occured the result still has to be + // If #P unmasked exception occurred the result still has to be // written to the destination. unmasked &= ~FPU_EX_Precision; diff --git a/bochs/cpu/msr.cc b/bochs/cpu/msr.cc index 568fd4144..2dd542bc2 100644 --- a/bochs/cpu/msr.cc +++ b/bochs/cpu/msr.cc @@ -661,7 +661,7 @@ bx_bool BX_CPP_AttrRegparmN(2) BX_CPU_C::wrmsr(Bit32u index, Bit64u val_64) return handle_unknown_wrmsr(index, val_64); } if (! isValidMSR_FixedMTRR(val_64)) { - BX_ERROR(("WRMSR: attempt to write invalid Memory Type to MSR_MTRRFIX16K regsiter !")); + BX_ERROR(("WRMSR: attempt to write invalid Memory Type to MSR_MTRRFIX16K register !")); return 0; } BX_CPU_THIS_PTR msr.mtrrfix16k[index - BX_MSR_MTRRFIX16K_80000] = val_64; diff --git a/bochs/cpu/paging.cc b/bochs/cpu/paging.cc index 80d456a3c..a4d83d263 100644 --- a/bochs/cpu/paging.cc +++ b/bochs/cpu/paging.cc @@ -654,7 +654,7 @@ int BX_CPU_C::check_entry_PAE(const char *s, Bit64u entry, Bit64u reserved, unsi if (entry & PAGE_DIRECTORY_NX_BIT) { if (rw == BX_EXECUTE) { - BX_DEBUG(("PAE %s: non-executable page fault occured", s)); + BX_DEBUG(("PAE %s: non-executable page fault occurred", s)); *nx_fault = 1; } } diff --git a/bochs/cpu/protect_ctrl.cc b/bochs/cpu/protect_ctrl.cc index b06f37bb8..0b9a7fb5d 100644 --- a/bochs/cpu/protect_ctrl.cc +++ b/bochs/cpu/protect_ctrl.cc @@ -662,7 +662,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::VERR_Ew(bxInstruction_c *i) } /* readable, non-conforming code segment */ if ((descriptor.dplsize. Returns 0. int create(const char* filename, const char* type, Bit64u size); creates a new empty redolog file, with header and catalog, named filename of type type for a size bytes image. -Returns 0 for OK or -1 if a problem occured. +Returns 0 for OK or -1 if a problem occurred. int create(int filedes, const char* type, Bit64u size); creates a new empty redolog file, with header and catalog, in a previously opened file described by filedes, of type type for a size bytes image. -Returns 0 for OK or -1 if a problem occured. +Returns 0 for OK or -1 if a problem occurred. int open(const char* filename, const char* type, Bit64u size); opens a redolog file named filename, and checks for consistency of header values against a type and size. -Returns 0 for OK or -1 if a problem occured. +Returns 0 for OK or -1 if a problem occurred. int open(const char* filename, const char* type, Bit64u size, int flags); @@ -2426,7 +2426,7 @@ closes a redolog file. seeks at logical data offset offset in a redolog. offset must be a multiple of 512. Only SEEK_SET and SEEK_CUR are supported for whence. -Returns -1 if a problem occured, or the current logical offset in +Returns -1 if a problem occurred, or the current logical offset in the redolog. @@ -2535,7 +2535,7 @@ as an undoable disk image. The image mode of this base image is auto-detected. All supported disk image modes can be used here. The associated redolog will be named pathname with a UNDOABLE_REDOLOG_EXTENSION suffix, unless set in the -constructor. Returns 0 for OK or -1 if a problem occured. +constructor. Returns 0 for OK or -1 if a problem occurred. @@ -2552,7 +2552,7 @@ off_t lseek(off_t offset, int whence); seeks at logical data position offset in the undoable disk image. Only SEEK_SET and SEEK_CUR are supported for whence. -Returns -1 if a problem occured, or the current logical +Returns -1 if a problem occurred, or the current logical offset in the undoable disk image. @@ -2618,7 +2618,7 @@ int open(const char* pathname); opens the disk image pathname in read-only mode, as a volatile disk image. The image mode is auto-detected. The associated redolog will be named pathname with a random suffix, -unless set in the constructor. Returns 0 for OK or -1 if a problem occured. +unless set in the constructor. Returns 0 for OK or -1 if a problem occurred. @@ -2636,7 +2636,7 @@ off_t lseek(off_t offset, int whence); seeks at logical data position offset in the volatile disk image. Only SEEK_SET and SEEK_CUR are supported for whence. -Returns -1 if a problem occured, or the current logical offset in +Returns -1 if a problem occurred, or the current logical offset in the volatile disk image. @@ -2698,7 +2698,7 @@ object. This disk image logical length is size bytes. int open(const char* pathname); opens the growing disk image pathname, -Returns 0 for OK or -1 if a problem occured. +Returns 0 for OK or -1 if a problem occurred. @@ -2715,7 +2715,7 @@ off_t lseek(off_t offset, int whence); seeks at logical data position offset in the growable disk image. Only SEEK_SET and SEEK_CUR are supported for whence. -Returns -1 if a problem occured, or the current logical offset in +Returns -1 if a problem occurred, or the current logical offset in the grwoing image. diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk index 91f429a6a..d5a56d7e6 100644 --- a/bochs/doc/docbook/user/user.dbk +++ b/bochs/doc/docbook/user/user.dbk @@ -2484,7 +2484,7 @@ SMP, x86_64 support) and the devices options (e.g. PCI, USB, Cirrus graphics). no Enable experimental 3dfx Voodoo Graphics emulation. The Voodoo1 is known to work, the Voodoo2 support is not yet complete, but almost usable. - The Banshee / Voodoo3 support is under construction, but basicly usable. + The Banshee / Voodoo3 support is under construction, but basically usable. For more information see . @@ -3492,7 +3492,7 @@ See example in msrs.def. Ignore MSR references that Bochs does not understand; print a warning message instead of generating #GP exception. This option is enabled by default but -will not be avaiable if configurable MSRs are enabled. +will not be available if configurable MSRs are enabled. ips @@ -3860,7 +3860,7 @@ Example: This defines the Voodoo Graphics emulation (experimental). Currently supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The Voodoo2 support is not yet complete, but almost usable. The Banshee / -Voodoo3 support is under construction, but basicly usable. The 2D/3D cards +Voodoo3 support is under construction, but basically usable. The 2D/3D cards require an external VGA BIOS the vga extension option to be set to 'voodoo'. If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5). The gui screen update timing for all models is controlled by the related @@ -4918,7 +4918,7 @@ at runtime. The optionsX parameter can be used to assign specific options to the device connected to the corresponding USB port. Currently this feature is used to set the speed reported by device ('low', 'full', 'high' or -'super'). The availabe speed choices depend on both HC and device. The option +'super'). The available speed choices depend on both HC and device. The option 'debug' turns on debug output for the device at connection time. For the USB 'disk' device the optionsX parameter can be used to specify an alternative redolog file (journal) of some image modes. For 'vvfat' mode USB disks the optionsX diff --git a/bochs/doc/man/bochsrc.5 b/bochs/doc/man/bochsrc.5 index 76aeef786..f0615d336 100644 --- a/bochs/doc/man/bochsrc.5 +++ b/bochs/doc/man/bochsrc.5 @@ -172,7 +172,7 @@ ignore_bad_msrs: Ignore MSR references that Bochs does not understand; print a warning message instead of generating #GP exception. This option is enabled -by default but will not be avaiable if configurable MSRs are enabled. +by default but will not be available if configurable MSRs are enabled. ips: @@ -485,7 +485,7 @@ Examples: This defines the Voodoo Graphics emulation (experimental). Currently supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The Voodoo2 support is not yet complete, but almost usable. The Banshee / -Voodoo3 support is under construction, but basicly usable. The 2D/3D cards +Voodoo3 support is under construction, but basically usable. The 2D/3D cards require an external VGA BIOS the vga extension option to be set to 'voodoo'. If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5). The gui screen update timing for all models is controlled by the related @@ -1229,7 +1229,7 @@ changed at runtime. The optionsX parameter can be used to assign specific options to the device connected to the corresponding USB port. Currently this feature is used to set the speed reported by device ('low', 'full', 'high' or 'super'). The -availabe speed choices depend on both HC and device. The option 'debug' turns +available speed choices depend on both HC and device. The option 'debug' turns on debug output for the device at connection time. For the USB 'disk' device the optionsX parameter can be used to specify an alternative redolog file (journal) of some image modes. For 'vvfat' mode USB diff --git a/bochs/gui/enh_dbg.cc b/bochs/gui/enh_dbg.cc index 92854868c..fc3e081e3 100644 --- a/bochs/gui/enh_dbg.cc +++ b/bochs/gui/enh_dbg.cc @@ -1081,7 +1081,7 @@ void LoadRegList() ++itemnum; } } - // display System regsiters (if requested) + // display System registers (if requested) // displaying these once may be necessary for column resizing if (SeeReg[2] || (ResizeColmns != FALSE && NeedSysRresize != FALSE)) { diff --git a/bochs/gui/term.cc b/bochs/gui/term.cc index 7c03ff250..332f0d264 100644 --- a/bochs/gui/term.cc +++ b/bochs/gui/term.cc @@ -606,7 +606,7 @@ int bx_term_gui_c::set_clipboard_text(char *text_snapshot, Bit32u len) bx_bool bx_term_gui_c::palette_change(Bit8u index, Bit8u red, Bit8u green, Bit8u blue) { - BX_DEBUG(("color pallete request (%d,%d,%d,%d) ignored", index,red,green,blue)); + BX_DEBUG(("color palette request (%d,%d,%d,%d) ignored", index,red,green,blue)); return(0); } diff --git a/bochs/iodev/cmos.cc b/bochs/iodev/cmos.cc index b986b68a4..ac1e81398 100644 --- a/bochs/iodev/cmos.cc +++ b/bochs/iodev/cmos.cc @@ -245,7 +245,7 @@ void bx_cmos_c::init(void) BX_PANIC(("CMOS: error reading cmos file.")); } close(fd); - BX_INFO(("successfuly read from image file '%s'.", + BX_INFO(("successfully read from image file '%s'.", SIM->get_param_string(BXPN_CMOSIMAGE_PATH)->getptr())); BX_CMOS_THIS s.rtc_mode_12hour = ((BX_CMOS_THIS s.reg[REG_STAT_B] & 0x02) == 0); BX_CMOS_THIS s.rtc_mode_binary = ((BX_CMOS_THIS s.reg[REG_STAT_B] & 0x04) != 0); diff --git a/bochs/iodev/display/vga.cc b/bochs/iodev/display/vga.cc index 45b45f54c..f79cc0989 100644 --- a/bochs/iodev/display/vga.cc +++ b/bochs/iodev/display/vga.cc @@ -1220,7 +1220,7 @@ Bit32u bx_vga_c::vbe_write(Bit32u address, Bit32u value, unsigned io_len) // virt_height >=yres // virt_width*virt_height < MAX_VIDEO_MEMORY - // basicly 2 situations + // basically 2 situations // situation 1: // MAX_VIDEO_MEMORY / virt_width >= yres diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc index e69ec34e6..3399c8c34 100644 --- a/bochs/iodev/harddrv.cc +++ b/bochs/iodev/harddrv.cc @@ -1102,7 +1102,7 @@ Bit32u bx_hard_drive_c::read(Bit32u address, unsigned io_len) (unsigned) address)); } - BX_PANIC(("hard drive: shouldnt get here!")); + BX_PANIC(("hard drive: shouldn't get here!")); return(0); return_value32: diff --git a/bochs/iodev/network/eth_socket.cc b/bochs/iodev/network/eth_socket.cc index a54ed239b..c670f7456 100644 --- a/bochs/iodev/network/eth_socket.cc +++ b/bochs/iodev/network/eth_socket.cc @@ -30,7 +30,7 @@ // // the idea is to provide a software multiport 'ethernet hub' and allow // communication between multiple bochs instances on the same machine -// entirely in userspace and without need for root priviledges. +// entirely in userspace and without need for root privileges. // // The config line in .bochsrc should look like: // @@ -225,7 +225,7 @@ bx_socket_pktmover_c::bx_socket_pktmover_c(const char *netif, #ifndef WIN32 this->fd = INVALID_SOCKET; if (errno == EACCES) - BX_PANIC(("eth_socket: insufficient priviledges to open socket")); + BX_PANIC(("eth_socket: insufficient privileges to open socket")); else BX_PANIC(("eth_socket: could not open socket: %s", strerror(errno))); #else diff --git a/bochs/iodev/sound/sb16.cc b/bochs/iodev/sound/sb16.cc index d637fab43..ea2e56b77 100644 --- a/bochs/iodev/sound/sb16.cc +++ b/bochs/iodev/sound/sb16.cc @@ -2346,7 +2346,7 @@ void bx_sb16_c::opl_timerevent() } else { mask = 0x3ff; } - if (((++OPL.timer[i]) & mask) == 0) { // overflow occured, set flags accordingly + if (((++OPL.timer[i]) & mask) == 0) { // overflow occurred, set flags accordingly OPL.timer[i] = OPL.timerinit[i]; // reset the counter if ((OPL.tmask[i/2] >> (6 - (i % 2))) == 0) { // set flags only if unmasked writelog(MIDILOG(5), "OPL Timer Interrupt: Chip %d, Timer %d", i/2, 1 << (i % 2)); diff --git a/bochs/iodev/sound/sb16.h b/bochs/iodev/sound/sb16.h index 7ea2852a1..d5755ab55 100644 --- a/bochs/iodev/sound/sb16.h +++ b/bochs/iodev/sound/sb16.h @@ -68,7 +68,7 @@ BX_SB16_IOADLIBLEN should be 2 or 4. If 0, Ports 0x388.. don't get used, but the OPL2 can still be accessed at 0x228..0x229. If 2, the usual Adlib emulation is enabled. If 4, an OPL3 is - emulated at adresses 0x388..0x38b, or two separate OPL2's. + emulated at addresses 0x388..0x38b, or two separate OPL2's. */ #define BX_SB16_MIX_REG 0x100 // total number of mixer registers @@ -226,7 +226,7 @@ private: Bit16u timer[4]; // two timers on each chip Bit16u timerinit[4]; // initial timer counts int tmask[2]; // the timer masking byte for both chips - int tflag[2]; // shows if the timer overflow has occured + int tflag[2]; // shows if the timer overflow has occurred } opl; struct bx_sb16_mixer_struct { diff --git a/bochs/iodev/usb/scsi_device.cc b/bochs/iodev/usb/scsi_device.cc index 2fe6edf44..1af8e51a5 100644 --- a/bochs/iodev/usb/scsi_device.cc +++ b/bochs/iodev/usb/scsi_device.cc @@ -846,7 +846,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun, bx_bool r->async_mode = async; break; case 0x35: - BX_DEBUG(("Syncronise cache (sector " FMT_LL "d, count %d)", lba, len)); + BX_DEBUG(("Synchronise cache (sector " FMT_LL "d, count %d)", lba, len)); // TODO: flush cache break; case 0x43: diff --git a/bochs/iodev/usb/uhci_core.cc b/bochs/iodev/usb/uhci_core.cc index 8e03b93c5..d9e2e2a73 100644 --- a/bochs/iodev/usb/uhci_core.cc +++ b/bochs/iodev/usb/uhci_core.cc @@ -307,8 +307,8 @@ Bit32u bx_uhci_core_c::read(Bit32u address, unsigned io_len) val = hub.usb_sof.sof_timing; break; - case 0x14: // port #3 non existant, but linux systems check it to see if there are more than 2 - BX_ERROR(("read from non existant offset 0x14 (port #3)")); + case 0x14: // port #3 non existent, but linux systems check it to see if there are more than 2 + BX_ERROR(("read from non existent offset 0x14 (port #3)")); val = 0xFF7F; break; @@ -488,8 +488,8 @@ void bx_uhci_core_c::write(Bit32u address, Bit32u value, unsigned io_len) hub.usb_sof.sof_timing = value; break; - case 0x14: // port #3 non existant, but linux systems check it to see if there are more than 2 - BX_ERROR(("write to non existant offset 0x14 (port #3)")); + case 0x14: // port #3 non existent, but linux systems check it to see if there are more than 2 + BX_ERROR(("write to non existent offset 0x14 (port #3)")); break; case 0x10: // port #1 diff --git a/bochs/misc/make_cmos_image.cc b/bochs/misc/make_cmos_image.cc index e5efeebf3..615ff56f2 100644 --- a/bochs/misc/make_cmos_image.cc +++ b/bochs/misc/make_cmos_image.cc @@ -95,6 +95,6 @@ main(int argc, char *argv[]) } close(fd); - printf("CMOS data successfuly written to file '%s'.\n", argv[1]); + printf("CMOS data successfully written to file '%s'.\n", argv[1]); return 0; }