diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-02-19 16:52:36 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-02-19 16:52:36 -0800 |
commit | bc7ea9c422f98f969dca78b4736718e3c44edd9b (patch) | |
tree | 0f4587c25fb8260511c9b7fb899555ce1510ffbe /com32/lib | |
parent | fe7dbcbaec8b5210604f942f322cecf55a37abe0 (diff) | |
download | syslinux-bc7ea9c422f98f969dca78b4736718e3c44edd9b.tar.gz |
Whitespace cleanup...syslinux-3.62-pre11
Diffstat (limited to 'com32/lib')
-rw-r--r-- | com32/lib/Makefile | 2 | ||||
-rw-r--r-- | com32/lib/pci/scan.c | 20 | ||||
-rw-r--r-- | com32/lib/sys/entry.S | 2 | ||||
-rw-r--r-- | com32/lib/sys/vesa/background.c | 2 | ||||
-rw-r--r-- | com32/lib/sys/vesa/initvesa.c | 2 | ||||
-rw-r--r-- | com32/lib/sys/vesa/screencpy.c | 10 | ||||
-rw-r--r-- | com32/lib/syslinux/getadv.c | 6 | ||||
-rw-r--r-- | com32/lib/syslinux/reboot.c | 8 |
8 files changed, 26 insertions, 26 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile index d8fb30d2..810c2bc5 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -85,7 +85,7 @@ LIBOBJS = \ \ syslinux/pxe_get_cached.o \ \ - syslinux/adv.o syslinux/advwrite.o syslinux/getadv.o \ + syslinux/adv.o syslinux/advwrite.o syslinux/getadv.o \ syslinux/setadv.o BINDIR = /usr/bin diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c index 0add9f9c..11869930 100644 --- a/com32/lib/pci/scan.c +++ b/com32/lib/pci/scan.c @@ -89,7 +89,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list) /* adding a pci_dev_info member if needed*/ for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) { struct pci_device *pci_device = &(pci_device_list->pci_device[pci_dev]); - + /* initialize the pci_dev_info structure if it doesn't exist yet. */ if (! pci_device->pci_dev_info) { pci_device->pci_dev_info = calloc(1,sizeof (struct pci_device)); @@ -100,7 +100,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list) } pci_device->pci_dev_info->linux_kernel_module=strdup("unknown"); } - + /* Opening the modules.pcimap (ofa linux kernel) from the boot device*/ f=fopen("modules.pcimap","r"); if (!f) @@ -116,7 +116,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list) /*skipping unecessary lines */ if ((line[0] == '#') || (line[0] == ' ') || (line[0] == 10)) continue; - + char *result = NULL; int field=0; @@ -143,7 +143,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list) for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) { struct pci_device *pci_device = &pci_device_list->pci_device[pci_dev]; - + if (hex_to_int(vendor_id) == pci_device->vendor && hex_to_int(product_id) == pci_device->product && (hex_to_int(sub_product_id) & pci_device->sub_product) @@ -185,7 +185,7 @@ void get_name_from_pci_ids(struct pci_device_list *pci_device_list) return; } } - + pci_device->pci_dev_info->vendor_name=strdup("unknown"); pci_device->pci_dev_info->product_name=strdup("unknown"); } @@ -261,25 +261,25 @@ void get_name_from_pci_ids(struct pci_device_list *pci_device_list) /* if we have two tabs, it means this is a sub product */ } else if ((line[0] == '\t') && (line[1] == '\t')) { - + /* the product name is last field */ product=skipspace(strstr(line," ")); product=strdup(skipspace(strstr(product," "))); remove_eol(product); - + /* the sub_vendor id is first field */ strncpy(sub_vendor_id,&line[2],4); sub_vendor_id[4]=0; - + /* the sub_vendor id is second field */ strncpy(sub_product_id,&line[7],4); sub_product_id[4]=0; - + /* assign the product_name to any matching pci device*/ for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) { struct pci_device *pci_device = &pci_device_list->pci_device[pci_dev]; - + if (hex_to_int(vendor_id) == pci_device->vendor && hex_to_int(product_id) == pci_device->product && hex_to_int(sub_product_id) == pci_device->sub_product && diff --git a/com32/lib/sys/entry.S b/com32/lib/sys/entry.S index 0e3a80be..5834d5d5 100644 --- a/com32/lib/sys/entry.S +++ b/com32/lib/sys/entry.S @@ -29,7 +29,7 @@ /* Number of arguments in our version of the entry structure */ #define COM32_ARGS 6 - + .section ".init","ax" .globl _start .type _start, @function diff --git a/com32/lib/sys/vesa/background.c b/com32/lib/sys/vesa/background.c index 941d155d..3bdda208 100644 --- a/com32/lib/sys/vesa/background.c +++ b/com32/lib/sys/vesa/background.c @@ -54,7 +54,7 @@ static void draw_background_line(int line, int start, int npixels) uint32_t *bgptr = &__vesacon_background[line][start]; unsigned int bytes_per_pixel = __vesacon_bytes_per_pixel; size_t fbptr = line*__vesa_info.mi.logical_scan + start*bytes_per_pixel; - + __vesacon_copy_to_screen(fbptr, bgptr, npixels); } diff --git a/com32/lib/sys/vesa/initvesa.c b/com32/lib/sys/vesa/initvesa.c index 7032bb94..0c2574db 100644 --- a/com32/lib/sys/vesa/initvesa.c +++ b/com32/lib/sys/vesa/initvesa.c @@ -164,7 +164,7 @@ static int vesacon_set_mode(void) continue; /* We don't support multibank (interlaced memory) modes */ - /* + /* * Note: The Bochs VESA BIOS (vbe.c 1.58 2006/08/19) violates the * specification which states that banks == 1 for unbanked modes; * fortunately it does report bank_size == 0 for those. diff --git a/com32/lib/sys/vesa/screencpy.c b/com32/lib/sys/vesa/screencpy.c index a3043fd4..a63a1ccf 100644 --- a/com32/lib/sys/vesa/screencpy.c +++ b/com32/lib/sys/vesa/screencpy.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2008 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person @@ -10,10 +10,10 @@ * sell copies of the Software, and to permit persons to whom * the Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall * be included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -61,13 +61,13 @@ void __vesacon_init_copy_to_screen(void) wi.win_num = -1; /* Not a window */ } else { /* Paged frame buffer */ - + /* We have already tested that *one* of these is usable */ if ((mi->win_attr[0] & 0x05) == 0x05 && mi->win_seg[0]) winn = 0; else winn = 1; - + wi.win_num = winn; wi.win_base = (char *)(mi->win_seg[winn] << 4); wi.win_size = mi->win_size << 10; diff --git a/com32/lib/syslinux/getadv.c b/com32/lib/syslinux/getadv.c index a4fb3f5e..3cb1785b 100644 --- a/com32/lib/syslinux/getadv.c +++ b/com32/lib/syslinux/getadv.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2007-2008 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person @@ -10,10 +10,10 @@ * sell copies of the Software, and to permit persons to whom * the Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall * be included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/com32/lib/syslinux/reboot.c b/com32/lib/syslinux/reboot.c index 110755f5..49b370e5 100644 --- a/com32/lib/syslinux/reboot.c +++ b/com32/lib/syslinux/reboot.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2007-2008 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person @@ -10,10 +10,10 @@ * sell copies of the Software, and to permit persons to whom * the Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall * be included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -38,7 +38,7 @@ __noreturn syslinux_reboot(int warm) { uint16_t * const reboot_flag = (uint16_t *)0x472; - + *reboot_flag = warm ? 0x1234 : 0; __farcall(0xf000, 0xfff0, &__com32_zero_regs, NULL); |