summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
Diffstat (limited to 'src/device')
-rw-r--r--src/device/device_util.c10
-rw-r--r--src/device/oprom/include/x86emu/fpu_regs.h18
-rw-r--r--src/device/oprom/include/x86emu/regs.h60
-rw-r--r--src/device/oprom/include/x86emu/x86emu.h2
-rw-r--r--src/device/oprom/x86emu/sys.c2
-rw-r--r--src/device/oprom/yabel/compat/functions.c16
-rw-r--r--src/device/oprom/yabel/compat/of.h8
-rw-r--r--src/device/oprom/yabel/compat/rtas.h14
-rw-r--r--src/device/oprom/yabel/io.c46
-rw-r--r--src/device/pci_rom.c2
10 files changed, 89 insertions, 89 deletions
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 859de319fa..762f0e76ff 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -812,11 +812,11 @@ static void resource_tree(struct device *root, int debug_level, int depth)
indent[i] = ' ';
indent[i] = '\0';
- do_printk(BIOS_DEBUG, "%s%s", indent, dev_path(root));
- if (root->link_list && root->link_list->children)
- do_printk(BIOS_DEBUG, " child on link 0 %s",
- dev_path(root->link_list->children));
- do_printk(BIOS_DEBUG, "\n");
+ do_printk(BIOS_DEBUG, "%s%s", indent, dev_path(root));
+ if (root->link_list && root->link_list->children)
+ do_printk(BIOS_DEBUG, " child on link 0 %s",
+ dev_path(root->link_list->children));
+ do_printk(BIOS_DEBUG, "\n");
for (res = root->resource_list; res; res = res->next) {
do_printk(debug_level, "%s%s resource base %llx size %llx "
diff --git a/src/device/oprom/include/x86emu/fpu_regs.h b/src/device/oprom/include/x86emu/fpu_regs.h
index f49fb1dd39..a9b4893801 100644
--- a/src/device/oprom/include/x86emu/fpu_regs.h
+++ b/src/device/oprom/include/x86emu/fpu_regs.h
@@ -46,11 +46,11 @@
/* Basic 8087 register can hold any of the following values: */
union x86_fpu_reg_u {
- s8 tenbytes[10];
- double dval;
- float fval;
- s16 sval;
- s32 lval;
+ s8 tenbytes[10];
+ double dval;
+ float fval;
+ s16 sval;
+ s32 lval;
};
struct x86_fpu_reg {
@@ -81,10 +81,10 @@ struct x86_fpu_reg {
#define X86_FPU_STKTOP 0
struct x86_fpu_registers {
- struct x86_fpu_reg x86_fpu_stack[8];
- int x86_fpu_flags;
- int x86_fpu_config; /* rounding modes, etc. */
- short x86_fpu_tos, x86_fpu_bos;
+ struct x86_fpu_reg x86_fpu_stack[8];
+ int x86_fpu_flags;
+ int x86_fpu_config; /* rounding modes, etc. */
+ short x86_fpu_tos, x86_fpu_bos;
};
#pragma pack()
diff --git a/src/device/oprom/include/x86emu/regs.h b/src/device/oprom/include/x86emu/regs.h
index b5fb9e22b5..8eec112284 100644
--- a/src/device/oprom/include/x86emu/regs.h
+++ b/src/device/oprom/include/x86emu/regs.h
@@ -61,7 +61,7 @@
#ifdef __BIG_ENDIAN__
typedef struct {
- u32 e_reg;
+ u32 e_reg;
} I32_reg_t;
typedef struct {
@@ -75,7 +75,7 @@ typedef struct {
#else /* !__BIG_ENDIAN__ */
typedef struct {
- u32 e_reg;
+ u32 e_reg;
} I32_reg_t;
typedef struct {
@@ -111,7 +111,7 @@ struct i386_special_regs {
*/
struct i386_segment_regs {
- u16 CS, DS, SS, ES, FS, GS;
+ u16 CS, DS, SS, ES, FS, GS;
};
/* 8 bit registers */
@@ -260,35 +260,35 @@ struct i386_segment_regs {
#define INTR_HALTED 0x4
typedef struct {
- struct i386_general_regs gen;
- struct i386_special_regs spc;
- struct i386_segment_regs seg;
- /*
- * MODE contains information on:
- * REPE prefix 2 bits repe,repne
- * SEGMENT overrides 5 bits normal,DS,SS,CS,ES
- * Delayed flag set 3 bits (zero, signed, parity)
- * reserved 6 bits
- * interrupt # 8 bits instruction raised interrupt
- * BIOS video segregs 4 bits
- * Interrupt Pending 1 bits
- * Extern interrupt 1 bits
- * Halted 1 bits
- */
- u32 mode;
- volatile int intr; /* mask of pending interrupts */
- volatile int debug;
+ struct i386_general_regs gen;
+ struct i386_special_regs spc;
+ struct i386_segment_regs seg;
+ /*
+ * MODE contains information on:
+ * REPE prefix 2 bits repe,repne
+ * SEGMENT overrides 5 bits normal,DS,SS,CS,ES
+ * Delayed flag set 3 bits (zero, signed, parity)
+ * reserved 6 bits
+ * interrupt # 8 bits instruction raised interrupt
+ * BIOS video segregs 4 bits
+ * Interrupt Pending 1 bits
+ * Extern interrupt 1 bits
+ * Halted 1 bits
+ */
+ u32 mode;
+ volatile int intr; /* mask of pending interrupts */
+ volatile int debug;
#if IS_ENABLED(CONFIG_X86EMU_DEBUG)
- int check;
- u16 saved_ip;
- u16 saved_cs;
- int enc_pos;
- int enc_str_pos;
- char decode_buf[32]; /* encoded byte stream */
- char decoded_buf[256]; /* disassembled strings */
+ int check;
+ u16 saved_ip;
+ u16 saved_cs;
+ int enc_pos;
+ int enc_str_pos;
+ char decode_buf[32]; /* encoded byte stream */
+ char decoded_buf[256]; /* disassembled strings */
#endif
- u8 intno;
- u8 __pad[3];
+ u8 intno;
+ u8 __pad[3];
} X86EMU_regs;
/****************************************************************************
diff --git a/src/device/oprom/include/x86emu/x86emu.h b/src/device/oprom/include/x86emu/x86emu.h
index 3d1b949dd5..a5d436af94 100644
--- a/src/device/oprom/include/x86emu/x86emu.h
+++ b/src/device/oprom/include/x86emu/x86emu.h
@@ -155,7 +155,7 @@ void X86EMU_halt_sys(void);
#if IS_ENABLED(CONFIG_X86EMU_DEBUG)
#define HALT_SYS() \
- printf("halt_sys: in %s\n", __func__); \
+ printf("halt_sys: in %s\n", __func__); \
X86EMU_halt_sys();
#else
#define HALT_SYS() X86EMU_halt_sys()
diff --git a/src/device/oprom/x86emu/sys.c b/src/device/oprom/x86emu/sys.c
index afb7efbe5c..9c293bc561 100644
--- a/src/device/oprom/x86emu/sys.c
+++ b/src/device/oprom/x86emu/sys.c
@@ -138,7 +138,7 @@ u32 X86API rdl(u32 addr)
u8 *ptr;
ptr = mem_ptr(addr, 4);
- val = *(u32 *) (ptr);
+ val = *(u32 *) (ptr);
DB(if (DEBUG_MEM_TRACE())
printf("%#08x 4 -> %#x\n", addr, val);)
diff --git a/src/device/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c
index 5a51f18a6f..1cebdf0a5a 100644
--- a/src/device/oprom/yabel/compat/functions.c
+++ b/src/device/oprom/yabel/compat/functions.c
@@ -72,15 +72,15 @@ unsigned long tb_freq = 0;
u64 get_time(void)
{
- u64 act = 0;
+ u64 act = 0;
#if IS_ENABLED(CONFIG_ARCH_X86)
- u32 eax, edx;
+ u32 eax, edx;
- __asm__ __volatile__(
- "rdtsc"
- : "=a"(eax), "=d"(edx)
- : /* no inputs, no clobber */);
- act = ((u64) edx << 32) | eax;
+ __asm__ __volatile__(
+ "rdtsc"
+ : "=a"(eax), "=d"(edx)
+ : /* no inputs, no clobber */);
+ act = ((u64) edx << 32) | eax;
#endif
- return act;
+ return act;
}
diff --git a/src/device/oprom/yabel/compat/of.h b/src/device/oprom/yabel/compat/of.h
index ac13af28bb..31c9b59071 100644
--- a/src/device/oprom/yabel/compat/of.h
+++ b/src/device/oprom/yabel/compat/of.h
@@ -42,10 +42,10 @@
typedef struct
{
- unsigned int serv;
- int nargs;
- int nrets;
- unsigned int args[16];
+ unsigned int serv;
+ int nargs;
+ int nrets;
+ unsigned int args[16];
} of_arg_t;
diff --git a/src/device/oprom/yabel/compat/rtas.h b/src/device/oprom/yabel/compat/rtas.h
index f701cc61b4..ccad9e958b 100644
--- a/src/device/oprom/yabel/compat/rtas.h
+++ b/src/device/oprom/yabel/compat/rtas.h
@@ -38,13 +38,13 @@
#include "of.h"
typedef struct dtime {
- unsigned int year;
- unsigned int month;
- unsigned int day;
- unsigned int hour;
- unsigned int minute;
- unsigned int second;
- unsigned int nano;
+ unsigned int year;
+ unsigned int month;
+ unsigned int day;
+ unsigned int hour;
+ unsigned int minute;
+ unsigned int second;
+ unsigned int nano;
} dtime;
typedef void (*thread_t) (int);
diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c
index d6738019c6..b50a2f1cf8 100644
--- a/src/device/oprom/yabel/io.c
+++ b/src/device/oprom/yabel/io.c
@@ -101,47 +101,47 @@ void my_outl(X86EMU_pioAddr addr, u32 val)
static unsigned int
read_io(void *addr, size_t sz)
{
- unsigned int ret;
+ unsigned int ret;
/* since we are using inb instructions, we need the port number as 16bit value */
u16 port = (u16)(u32) addr;
- switch (sz) {
- case 1:
+ switch (sz) {
+ case 1:
ret = inb(port);
- break;
- case 2:
+ break;
+ case 2:
ret = inw(port);
- break;
- case 4:
+ break;
+ case 4:
ret = inl(port);
- break;
- default:
- ret = 0;
- }
+ break;
+ default:
+ ret = 0;
+ }
- return ret;
+ return ret;
}
static int
write_io(void *addr, unsigned int value, size_t sz)
{
u16 port = (u16)(u32) addr;
- switch (sz) {
+ switch (sz) {
/* since we are using inb instructions, we need the port number as 16bit value */
- case 1:
+ case 1:
outb(value, port);
- break;
- case 2:
+ break;
+ case 2:
outw(value, port);
- break;
- case 4:
+ break;
+ case 4:
outl(value, port);
- break;
- default:
- return -1;
- }
+ break;
+ default:
+ return -1;
+ }
- return 0;
+ return 0;
}
u32 pci_cfg_read(X86EMU_pioAddr addr, u8 size);
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 6456d17d6d..a411f06acf 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -148,7 +148,7 @@ struct rom_header *pci_rom_load(struct device *dev,
* whether the ROM image is for a VGA device because some
* devices have a mismatch between the hardware and the ROM.
*/
- if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {
+ if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {
#if !IS_ENABLED(CONFIG_MULTIPLE_VGA_ADAPTERS)
extern device_t vga_pri; /* Primary VGA device (device.c). */
if (dev != vga_pri) return NULL; /* Only one VGA supported. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 06:24:35 +0000