summaryrefslogtreecommitdiff
path: root/src/devices/oprom/yabel
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-27 06:56:47 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-27 06:56:47 +0000
commit14e22779625de673569c7b950ecc2753fb915b31 (patch)
tree14a6ed759e116e9e6e9bbd7f499b74b96d6cc072 /src/devices/oprom/yabel
parent0e1e8065e303030c39c3f2c27e5d32ee58a16c66 (diff)
Since some people disapprove of white space cleanups mixed in regular commits
while others dislike them being extra commits, let's clean them up once and for all for the existing code. If it's ugly, let it only be ugly once :-) Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/oprom/yabel')
-rw-r--r--src/devices/oprom/yabel/biosemu.c2
-rw-r--r--src/devices/oprom/yabel/biosemu.h2
-rw-r--r--src/devices/oprom/yabel/compat/functions.c2
-rw-r--r--src/devices/oprom/yabel/compat/of.h2
-rw-r--r--src/devices/oprom/yabel/compat/time.h2
-rw-r--r--src/devices/oprom/yabel/debug.h4
-rw-r--r--src/devices/oprom/yabel/interrupt.c14
-rw-r--r--src/devices/oprom/yabel/pmm.c12
-rw-r--r--src/devices/oprom/yabel/pmm.h2
-rw-r--r--src/devices/oprom/yabel/vbe.c6
10 files changed, 24 insertions, 24 deletions
diff --git a/src/devices/oprom/yabel/biosemu.c b/src/devices/oprom/yabel/biosemu.c
index 294d81f279..9cdd0f279b 100644
--- a/src/devices/oprom/yabel/biosemu.c
+++ b/src/devices/oprom/yabel/biosemu.c
@@ -250,7 +250,7 @@ biosemu(u8 *biosmem, u32 biosmem_size, struct device * dev, unsigned long rom_ad
X86EMU_setupMemFuncs(&my_mem_funcs);
//setup PMM struct in BIOS_DATA_SEGMENT, offset 0x0
- u8 pmm_length = pmm_setup(BIOS_DATA_SEGMENT, 0x0);
+ u8 pmm_length = pmm_setup(BIOS_DATA_SEGMENT, 0x0);
if (pmm_length <= 0) {
printf ("\nYABEL: Warning: PMM Area could not be setup. PMM not available (%x)\n",
pmm_length);
diff --git a/src/devices/oprom/yabel/biosemu.h b/src/devices/oprom/yabel/biosemu.h
index 09ace729ec..39cc0a9b0e 100644
--- a/src/devices/oprom/yabel/biosemu.h
+++ b/src/devices/oprom/yabel/biosemu.h
@@ -38,7 +38,7 @@
// 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 funtion 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
* this array and only runs the generic interrupt handler code, if
diff --git a/src/devices/oprom/yabel/compat/functions.c b/src/devices/oprom/yabel/compat/functions.c
index 035c8bc86e..c9ef0b7d77 100644
--- a/src/devices/oprom/yabel/compat/functions.c
+++ b/src/devices/oprom/yabel/compat/functions.c
@@ -61,6 +61,6 @@ u64 get_time(void)
"rdtsc"
: "=a"(eax), "=d"(edx)
: /* no inputs, no clobber */);
- act = ((u64) edx << 32) | eax;
+ act = ((u64) edx << 32) | eax;
return act;
}
diff --git a/src/devices/oprom/yabel/compat/of.h b/src/devices/oprom/yabel/compat/of.h
index 907139951f..6a00f7a316 100644
--- a/src/devices/oprom/yabel/compat/of.h
+++ b/src/devices/oprom/yabel/compat/of.h
@@ -19,7 +19,7 @@
#define phandle_t p32
#define ihandle_t p32
-typedef struct
+typedef struct
{
unsigned int serv;
int nargs;
diff --git a/src/devices/oprom/yabel/compat/time.h b/src/devices/oprom/yabel/compat/time.h
index 6f7099bd86..18dba3aa85 100644
--- a/src/devices/oprom/yabel/compat/time.h
+++ b/src/devices/oprom/yabel/compat/time.h
@@ -15,4 +15,4 @@
/* TODO: check how this works in x86 */
extern unsigned long tb_freq;
u64 get_time(void);
-#endif
+#endif
diff --git a/src/devices/oprom/yabel/debug.h b/src/devices/oprom/yabel/debug.h
index d02930809d..fea1fb7a3b 100644
--- a/src/devices/oprom/yabel/debug.h
+++ b/src/devices/oprom/yabel/debug.h
@@ -39,7 +39,7 @@ static inline void set_ci(void) {};
* |||-Currently unused
* ||||-Currently unused
* |||||-Currently unused
- * ||||||-DEBUG_PNP - Print Plug And Play access made by option rom
+ * ||||||-DEBUG_PNP - Print Plug And Play access made by option rom
* |||||||-DEBUG_DISK - Print Disk I/O related messages, currently unused
* ||||||||-DEBUG_PMM - Print messages related to POST Memory Manager (PMM)
* |||||||||-DEBUG_VBE - Print messages related to VESA BIOS Extension (VBE) functions
@@ -47,7 +47,7 @@ static inline void set_ci(void) {};
* |||||||||||-DEBUG_INTR - Print messages related to interrupt handling
* ||||||||||||-DEBUG_CHECK_VMEM_ACCESS - Print messages related to accesse to certain areas of the virtual Memory (e.g. BDA (BIOS Data Area) or Interrupt Vectors)
* |||||||||||||-DEBUG_MEM - Print memory access made by option rom (NOTE: this also includes accesses to fetch instructions)
- * ||||||||||||||-DEBUG_IO - Print I/O access made by option rom
+ * ||||||||||||||-DEBUG_IO - Print I/O access made by option rom
* 11000111111111 - Max Binary Value, Debug All (WARNING: - This could run for hours)
*/
diff --git a/src/devices/oprom/yabel/interrupt.c b/src/devices/oprom/yabel/interrupt.c
index 9a796005bb..af79379f67 100644
--- a/src/devices/oprom/yabel/interrupt.c
+++ b/src/devices/oprom/yabel/interrupt.c
@@ -410,7 +410,7 @@ handleInt1a(void)
M.x86.R_CL =
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_read_config8(dev, offs);
-#else
+#else
(u8) rtas_pci_config_read(bios_device.
puid, 1,
bus, devfn,
@@ -425,7 +425,7 @@ handleInt1a(void)
M.x86.R_CX =
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_read_config16(dev, offs);
-#else
+#else
(u16) rtas_pci_config_read(bios_device.
puid, 2,
bus, devfn,
@@ -440,7 +440,7 @@ handleInt1a(void)
M.x86.R_ECX =
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_read_config32(dev, offs);
-#else
+#else
(u32) rtas_pci_config_read(bios_device.
puid, 4,
bus, devfn,
@@ -478,7 +478,7 @@ handleInt1a(void)
case 0xb10b:
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_write_config8(bios_device.dev, offs, M.x86.R_CL);
-#else
+#else
rtas_pci_config_write(bios_device.puid, 1, bus,
devfn, offs, M.x86.R_CL);
#endif
@@ -490,7 +490,7 @@ handleInt1a(void)
case 0xb10c:
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_write_config16(bios_device.dev, offs, M.x86.R_CX);
-#else
+#else
rtas_pci_config_write(bios_device.puid, 2, bus,
devfn, offs, M.x86.R_CX);
#endif
@@ -502,7 +502,7 @@ handleInt1a(void)
case 0xb10d:
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
pci_write_config32(bios_device.dev, offs, M.x86.R_ECX);
-#else
+#else
rtas_pci_config_write(bios_device.puid, 4, bus,
devfn, offs, M.x86.R_ECX);
#endif
@@ -576,7 +576,7 @@ handleInterrupt(int intNum)
int_handled = 1;
break;
case PMM_INT_NUM:
- /* the selfdefined PMM INT number, this is called by the code in PMM struct, it
+ /* the selfdefined PMM INT number, this is called by the code in PMM struct, it
* is handled by pmm_handleInt()
*/
pmm_handleInt();
diff --git a/src/devices/oprom/yabel/pmm.c b/src/devices/oprom/yabel/pmm.c
index ad4dc6834c..989bde4d27 100644
--- a/src/devices/oprom/yabel/pmm.c
+++ b/src/devices/oprom/yabel/pmm.c
@@ -19,8 +19,8 @@
#include "device.h"
/* this struct is used to remember which PMM spaces
- * have been assigned. MAX_PMM_AREAS defines how many
- * PMM areas we can assign.
+ * have been assigned. MAX_PMM_AREAS defines how many
+ * PMM areas we can assign.
* All areas are assigned in PMM_CONV_SEGMENT
*/
typedef struct {
@@ -37,7 +37,7 @@ static pmm_allocation_t pmm_allocation_array[MAX_PMM_AREAS];
/* index into pmm_allocation_array */
static u32 curr_pmm_allocation_index = 0;
-/* This function is used to setup the PMM struct in virtual memory
+/* This function is used to setup the PMM struct in virtual memory
* at a certain offset, the length of the PMM struct is returned */
u8 pmm_setup(u16 segment, u16 offset)
{
@@ -79,7 +79,7 @@ u8 pmm_setup(u16 segment, u16 offset)
return sizeof(pmm_information_t);
}
-/* handle the selfdefined interrupt, this is executed, when the PMM Entry Point
+/* handle the selfdefined interrupt, this is executed, when the PMM Entry Point
* is executed, it must handle all PMM requests
*/
void pmm_handleInt()
@@ -136,7 +136,7 @@ void pmm_handleInt()
__func__, next_offset);
if (length == 0) {
/* largest possible block size requested, we have on segment
- * to allocate, so largest possible is segment size (0xFFFF)
+ * to allocate, so largest possible is segment size (0xFFFF)
* minus next_offset
*/
rval = 0xFFFF - next_offset;
@@ -151,7 +151,7 @@ void pmm_handleInt()
}
align = 1 << lsb;
}
- /* always align at least to paragraph (16byte) boundary
+ /* always align at least to paragraph (16byte) boundary
* hm... since the length is always in paragraphs, we cannot
* align outside of paragraphs anyway... so this check might
* be unnecessary...*/
diff --git a/src/devices/oprom/yabel/pmm.h b/src/devices/oprom/yabel/pmm.h
index 95645dffdc..3cc3c17ac6 100644
--- a/src/devices/oprom/yabel/pmm.h
+++ b/src/devices/oprom/yabel/pmm.h
@@ -34,7 +34,7 @@ typedef struct {
u8 code[3];
} __attribute__ ((__packed__)) pmm_information_t;
-/* This function is used to setup the PMM struct in virtual memory
+/* This function is used to setup the PMM struct in virtual memory
* at a certain offset */
u8 pmm_setup(u16 segment, u16 offset);
diff --git a/src/devices/oprom/yabel/vbe.c b/src/devices/oprom/yabel/vbe.c
index d80a97acc6..6ddeba613b 100644
--- a/src/devices/oprom/yabel/vbe.c
+++ b/src/devices/oprom/yabel/vbe.c
@@ -796,7 +796,7 @@ void vbe_set_graphics(void)
mode_info.video_mode = (1 << 14) | CONFIG_FRAMEBUFFER_VESA_MODE;
vbe_get_mode_info(&mode_info);
- unsigned char *framebuffer =
+ unsigned char *framebuffer =
(unsigned char *) le32_to_cpu(mode_info.vesa.phys_base_ptr);
DEBUG_PRINTF_VBE("FRAMEBUFFER: 0x%08x\n", framebuffer);
vbe_set_mode(&mode_info);
@@ -807,9 +807,9 @@ void vbe_set_graphics(void)
/* Switching Intel IGD to 1MB video memory will break this. Who
* cares. */
// int imagesize = 1024*768*2;
-
+
unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH);
- if (!jpeg) {
+ if (!jpeg) {
DEBUG_PRINTF_VBE("Could not find bootsplash.jpg\n");
return;
}