From 63373edce006983d1e2aef7d71c1653ae337ed18 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 8 Jul 2013 16:24:19 -0600 Subject: device: Fix spelling Change-Id: I53a40d114aa2da76398c5b97443d4096809dcf36 Signed-off-by: Martin Roth Reviewed-on: http://review.coreboot.org/3730 Reviewed-by: Ronald G. Minnich Reviewed-by: Paul Menzel Tested-by: Stefan Reinauer --- src/device/oprom/yabel/biosemu.c | 4 ++-- src/device/oprom/yabel/biosemu.h | 6 +++--- src/device/oprom/yabel/compat/functions.c | 2 +- src/device/oprom/yabel/device.c | 20 ++++++++++---------- src/device/oprom/yabel/interrupt.c | 4 ++-- src/device/oprom/yabel/io.c | 12 ++++++------ src/device/oprom/yabel/mem.c | 8 ++++---- src/device/oprom/yabel/pmm.c | 2 +- src/device/oprom/yabel/pmm.h | 6 +++--- src/device/oprom/yabel/vbe.c | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/device/oprom/yabel') diff --git a/src/device/oprom/yabel/biosemu.c b/src/device/oprom/yabel/biosemu.c index f42d4e1735..d27a5f1784 100644 --- a/src/device/oprom/yabel/biosemu.c +++ b/src/device/oprom/yabel/biosemu.c @@ -219,7 +219,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad my_wrb(0x000ffe6e, 0xcf); // setup BIOS Data Area (0000:04xx, or 0040:00xx) - // we currently 0 this area, meaning "we dont have + // we currently 0 this area, meaning "we don't have // any hardware" :-) no serial/parallel ports, floppys, ... memset(biosmem + 0x400, 0x0, 0x100); @@ -388,7 +388,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad */ if ((pop_word() == 0xf4f4) && (M.x86.R_SS == STACK_SEGMENT) && (M.x86.R_SP == STACK_START_OFFSET)) { - DEBUG_PRINTF("Stack is clean, initialization successfull!\n"); + DEBUG_PRINTF("Stack is clean, initialization successful!\n"); } else { printf("Stack unclean, initialization probably NOT COMPLETE!\n"); DEBUG_PRINTF("SS:SP = %04x:%04x, expected: %04x:%04x\n", diff --git a/src/device/oprom/yabel/biosemu.h b/src/device/oprom/yabel/biosemu.h index 4f5c4aaa5b..69e1fc35ba 100644 --- a/src/device/oprom/yabel/biosemu.h +++ b/src/device/oprom/yabel/biosemu.h @@ -24,7 +24,7 @@ #define VBE_SEGMENT 0x3000 #define PMM_CONV_SEGMENT 0x4000 // 4000:xxxx is PMM conventional memory area, extended memory area - // will be anything beyound MIN_REQUIRED_MEMORY_SIZE + // will be anything beyond MIN_REQUIRED_MEMORY_SIZE #define PNP_DATA_SEGMENT 0x5000 #define OPTION_ROM_CODE_SEGMENT 0xc000 @@ -38,9 +38,9 @@ // Address, there will only be a call to this INT and a RETF #define PNP_INT_NUM 0xFD -/* array of funtion pointers to override generic interrupt handlers +/* array of function pointers to override generic interrupt handlers * a YABEL caller can add functions to this array before calling YABEL - * if a interrupt occurs, YABEL checks wether a function is set in + * if a interrupt occurs, YABEL checks whether a function is set in * this array and only runs the generic interrupt handler code, if * the function pointer is NULL */ typedef int (* yabel_handleIntFunc)(void); diff --git a/src/device/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c index f0160ed52a..2c3dc33fc4 100644 --- a/src/device/oprom/yabel/compat/functions.c +++ b/src/device/oprom/yabel/compat/functions.c @@ -10,7 +10,7 @@ ****************************************************************************/ /* this file contains functions provided by SLOF, that the current biosemu implementation needs - * they should go away inthe future... + * they should go away in the future... */ #include diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c index b09f50e4ac..2f41847438 100644 --- a/src/device/oprom/yabel/device.c +++ b/src/device/oprom/yabel/device.c @@ -60,7 +60,7 @@ biosemu_dev_get_addr_info(void) r->index; translate_address_array[taa_index].address = r->base; translate_address_array[taa_index].size = r->size; - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; taa_index++; } @@ -71,7 +71,7 @@ biosemu_dev_get_addr_info(void) translate_address_array[taa_index].cfg_space_offset = 0x30; translate_address_array[taa_index].address = bios_device.img_addr; translate_address_array[taa_index].size = 0; /* TODO: do we need the size? */ - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; taa_index++; /* legacy ranges if its a VGA card... */ @@ -84,7 +84,7 @@ biosemu_dev_get_addr_info(void) translate_address_array[taa_index].cfg_space_offset = 0; translate_address_array[taa_index].address = 0x3b0; translate_address_array[taa_index].size = 0xc; - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; taa_index++; /* I/O 0x3C0-0x3DF */ @@ -94,7 +94,7 @@ biosemu_dev_get_addr_info(void) translate_address_array[taa_index].cfg_space_offset = 0; translate_address_array[taa_index].address = 0x3c0; translate_address_array[taa_index].size = 0x20; - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; taa_index++; /* Mem 0xA0000-0xBFFFF */ @@ -104,7 +104,7 @@ biosemu_dev_get_addr_info(void) translate_address_array[taa_index].cfg_space_offset = 0; translate_address_array[taa_index].address = 0xa0000; translate_address_array[taa_index].size = 0x20000; - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; taa_index++; } @@ -130,7 +130,7 @@ void translate_address_dev(u64 *, phandle_t); u64 get_puid(phandle_t node); -// scan all adresses assigned to the device ("assigned-addresses" and "reg") +// scan all addresses assigned to the device ("assigned-addresses" and "reg") // store in translate_address_array for faster translation using dev_translate_address void biosemu_dev_get_addr_info(void) @@ -171,7 +171,7 @@ biosemu_dev_get_addr_info(void) len = of_getprop(bios_device.phandle, "reg", buf, sizeof(buf)); for (i = 0; i < (len / sizeof(assigned_address_t)); i++) { if ((buf[i].size == 0) || (buf[i].cfg_space_offset != 0)) { - // we dont care for ranges with size 0 and + // we don't care for ranges with size 0 and // BARs and Expansion ROM must be in assigned-addresses... so in reg // we only look for those without config space offset set... // i.e. the legacy ranges @@ -211,7 +211,7 @@ biosemu_dev_get_addr_info(void) // "special memory" is a hack to make some parts of memory fall through to real memory // (ie. no translation). Necessary if option ROMs attempt DMA there, map registers or -// do similarily crazy things. +// do similarly crazy things. void biosemu_add_special_memory(u32 start, u32 size) { @@ -222,7 +222,7 @@ biosemu_add_special_memory(u32 start, u32 size) translate_address_array[taa_index].cfg_space_offset = 0; translate_address_array[taa_index].address = start; translate_address_array[taa_index].size = size; - /* dont translate addresses... all addresses are 1:1 */ + /* don't translate addresses... all addresses are 1:1 */ translate_address_array[taa_index].address_offset = 0; } @@ -443,7 +443,7 @@ biosemu_dev_translate_address(int type, unsigned long * addr) int i = 0; translate_address_t ta; #if !CONFIG_PCI_OPTION_ROM_RUN_YABEL - /* we dont need this hack for coreboot... we can access legacy areas */ + /* we don't need this hack for coreboot... we can access legacy areas */ //check if it is an access to legacy VGA Mem... if it is, map the address //to the vmem BAR and then translate it... // (translation info provided by Ben Herrenschmidt) diff --git a/src/device/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c index e5b4a3cff4..cf430be6cd 100644 --- a/src/device/oprom/yabel/interrupt.c +++ b/src/device/oprom/yabel/interrupt.c @@ -243,7 +243,7 @@ handleInt16(void) // since we currently always read the char from the FW buffer, // we misuse the ring buffer, we use it as pointer to a u64 that stores // multi-byte keys (e.g. special keys in VT100 terminal) - // and as long as a key is available (not 0) we dont read further keys + // and as long as a key is available (not 0) we don't read further keys u64 *keycode = (u64 *) (M.mem_base + 0x41e); s8 c; // function number in AH @@ -538,7 +538,7 @@ handleInterrupt(int intNum) DEBUG_PRINTF_INTR("%s(%x)\n", __func__, intNum); #endif - /* check wether this interrupt has a function pointer set in yabel_intFuncArray and run that */ + /* check whether this interrupt has a function pointer set in yabel_intFuncArray and run that */ if (yabel_intFuncArray[intNum]) { DEBUG_PRINTF_INTR("%s(%x) intHandler overridden, calling it...\n", __func__, intNum); int_handled = (*yabel_intFuncArray[intNum])(); diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c index d1172dc743..94f610debd 100644 --- a/src/device/oprom/yabel/io.c +++ b/src/device/oprom/yabel/io.c @@ -188,7 +188,7 @@ my_inb(X86EMU_pioAddr addr) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x): access to Device I/O\n", __func__, addr); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -238,7 +238,7 @@ my_inw(X86EMU_pioAddr addr) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x): access to Device I/O\n", __func__, addr); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -283,7 +283,7 @@ my_inl(X86EMU_pioAddr addr) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x): access to Device I/O\n", __func__, addr); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -329,7 +329,7 @@ my_outb(X86EMU_pioAddr addr, u8 val) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x, %x): access to Device I/O\n", __func__, addr, val); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -361,7 +361,7 @@ my_outw(X86EMU_pioAddr addr, u16 val) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x, %x): access to Device I/O\n", __func__, addr, val); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -402,7 +402,7 @@ my_outl(X86EMU_pioAddr addr, u32 val) unsigned long translated_addr = addr; u8 translated = biosemu_dev_translate_address(IORESOURCE_IO, &translated_addr); if (translated != 0) { - //translation successfull, access Device I/O (BAR or Legacy...) + //translation successful, access Device I/O (BAR or Legacy...) DEBUG_PRINTF_IO("%s(%x, %x): access to Device I/O\n", __func__, addr, val); //DEBUG_PRINTF_IO("%s(%04x): translated_addr: %llx\n", __func__, addr, translated_addr); diff --git a/src/device/oprom/yabel/mem.c b/src/device/oprom/yabel/mem.c index 4b4a552813..a7d0289d71 100644 --- a/src/device/oprom/yabel/mem.c +++ b/src/device/oprom/yabel/mem.c @@ -177,7 +177,7 @@ static inline void DEBUG_CHECK_VMEM_WRITE(u32 _addr, u32 _val) {}; static void update_time(u32 cur_val) { - //for convenience, we let the start of timebase be at midnight, we currently dont support + //for convenience, we let the start of timebase be at midnight, we currently don't support //real daytime anyway... u64 ticks_per_day = tb_freq * 60 * 24; // at 18Hz a period is ~55ms, converted to ticks (tb_freq is ticks/second) @@ -202,7 +202,7 @@ my_rdb(u32 addr) u8 translated = biosemu_dev_translate_address(IORESOURCE_MEM, &translated_addr); u8 rval; if (translated != 0) { - //translation successfull, access VGA Memory (BAR or Legacy...) + //translation successful, access VGA Memory (BAR or Legacy...) DEBUG_PRINTF_MEM("%s(%08x): access to VGA Memory\n", __func__, addr); //DEBUG_PRINTF_MEM("%s(%08x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -234,7 +234,7 @@ my_rdw(u32 addr) u8 translated = biosemu_dev_translate_address(IORESOURCE_MEM, &translated_addr); u16 rval; if (translated != 0) { - //translation successfull, access VGA Memory (BAR or Legacy...) + //translation successful, access VGA Memory (BAR or Legacy...) DEBUG_PRINTF_MEM("%s(%08x): access to VGA Memory\n", __func__, addr); //DEBUG_PRINTF_MEM("%s(%08x): translated_addr: %llx\n", __func__, addr, translated_addr); @@ -285,7 +285,7 @@ my_rdl(u32 addr) u8 translated = biosemu_dev_translate_address(IORESOURCE_MEM, &translated_addr); u32 rval; if (translated != 0) { - //translation successfull, access VGA Memory (BAR or Legacy...) + //translation successful, access VGA Memory (BAR or Legacy...) DEBUG_PRINTF_MEM("%s(%x): access to VGA Memory\n", __func__, addr); //DEBUG_PRINTF_MEM("%s(%08x): translated_addr: %llx\n", __func__, addr, translated_addr); diff --git a/src/device/oprom/yabel/pmm.c b/src/device/oprom/yabel/pmm.c index 19d14d46b6..d6c528d1dc 100644 --- a/src/device/oprom/yabel/pmm.c +++ b/src/device/oprom/yabel/pmm.c @@ -222,7 +222,7 @@ void pmm_handleInt() DEBUG_PRINTF_PMM("%s: pmmDeallocate: PMM segment offset: %x\n", __func__, buffer); i = 0; - /* rval = 0 means we deallocated the buffer, so set it to 1 in case we dont find it and + /* rval = 0 means we deallocated the buffer, so set it to 1 in case we don't find it and * thus cannot deallocate */ rval = 1; diff --git a/src/device/oprom/yabel/pmm.h b/src/device/oprom/yabel/pmm.h index 3cc3c17ac6..6416c118f0 100644 --- a/src/device/oprom/yabel/pmm.h +++ b/src/device/oprom/yabel/pmm.h @@ -24,9 +24,9 @@ typedef struct { u8 checksum; u32 entry_point_offset; u8 reserved[5]; - /* Code is not part of the speced PMM struct, however, since I cannot - * put the handling of PMM in the virtual memory (I dont want to hack it - * together in x86 assembly ;-)) this code array is pointed to by + /* Code is not part of the specced PMM struct, however, since I cannot + * put the handling of PMM in the virtual memory (I don't want to hack + * it together in x86 assembly ;-)) this code array is pointed to by * entry_point_offset, in code there is only a INT call and a RETF, * thus every PMM call will issue a PMM INT (only defined in YABEL, * see interrupt.c) and the INT Handler will do the actual PMM work. diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c index 5952dae568..8658b7747b 100644 --- a/src/device/oprom/yabel/vbe.c +++ b/src/device/oprom/yabel/vbe.c @@ -103,7 +103,7 @@ vbe_info(vbe_info_t * info) // offset 4: 16bit le containing VbeVersion info->version = in16le(vbe_info_buffer + 4); - // offset 6: 32bit le containg segment:offset of OEM String in virtual Mem. + // offset 6: 32bit le containing segment:offset of OEM String in virtual Mem. info->oem_string_ptr = biosmem + ((in16le(vbe_info_buffer + 8) << 4) + in16le(vbe_info_buffer + 6)); @@ -457,7 +457,7 @@ vbe_get_info(void) // as input, it must contain a screen_info_input_t with the following content: // byte[0:3] = "DDC\0" (zero-terminated signature header) // byte[4:5] = reserved space for the return struct... just in case we ever change - // the struct and dont have reserved enough memory (and let's hope the struct + // the struct and don't have reserved enough memory (and let's hope the struct // never gets larger than 64KB) // byte[6] = monitor port number for DDC requests ("only" one byte... so lets hope we never have more than 255 monitors... // byte[7:8] = max. screen width (OF may want to limit this) -- cgit v1.2.3