diff options
Diffstat (limited to 'qemu/roms/openbios/include')
| -rw-r--r-- | qemu/roms/openbios/include/arch/ppc/types.h | 8 | ||||
| -rw-r--r-- | qemu/roms/openbios/include/arch/sparc64/io.h | 2 | ||||
| -rw-r--r-- | qemu/roms/openbios/include/drivers/drivers.h | 1 | ||||
| -rw-r--r-- | qemu/roms/openbios/include/libopenbios/bindings.h | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/qemu/roms/openbios/include/arch/ppc/types.h b/qemu/roms/openbios/include/arch/ppc/types.h index 69b3db405..b2246d060 100644 --- a/qemu/roms/openbios/include/arch/ppc/types.h +++ b/qemu/roms/openbios/include/arch/ppc/types.h @@ -84,21 +84,13 @@ typedef uint32_t prom_uarg_t; /* size named types */ typedef unsigned char u8; -typedef unsigned char __u8; typedef unsigned short u16; -typedef unsigned short __u16; typedef unsigned int u32; -typedef unsigned int __u32; typedef unsigned long long u64; -typedef unsigned long long __u64; typedef signed char s8; -typedef signed char __s8; typedef short s16; -typedef short __s16; typedef int s32; -typedef int __s32; typedef long long s64; -typedef long long __s64; #endif diff --git a/qemu/roms/openbios/include/arch/sparc64/io.h b/qemu/roms/openbios/include/arch/sparc64/io.h index 2e4dfa37f..0f1a73284 100644 --- a/qemu/roms/openbios/include/arch/sparc64/io.h +++ b/qemu/roms/openbios/include/arch/sparc64/io.h @@ -9,7 +9,7 @@ extern unsigned long va_shift; // Set in entry.S // Defined in ldscript -extern char _start, _data, _stack, _estack, _end, _iomem; +extern char _start, _data, _stack, _estack, _fcstack, _efcstack, _end, _iomem; // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) diff --git a/qemu/roms/openbios/include/drivers/drivers.h b/qemu/roms/openbios/include/drivers/drivers.h index 3b83b12d1..48f81a870 100644 --- a/qemu/roms/openbios/include/drivers/drivers.h +++ b/qemu/roms/openbios/include/drivers/drivers.h @@ -52,6 +52,7 @@ void kbd_init(uint64_t base); /* drivers/ide.c */ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, uint32_t io_port1, uint32_t ctl_port1); +void ob_ide_quiesce(void); int macio_ide_init(const char *path, uint32_t addr, int nb_channels); #endif #ifdef CONFIG_DRIVER_ESP diff --git a/qemu/roms/openbios/include/libopenbios/bindings.h b/qemu/roms/openbios/include/libopenbios/bindings.h index de9c77520..4ec978912 100644 --- a/qemu/roms/openbios/include/libopenbios/bindings.h +++ b/qemu/roms/openbios/include/libopenbios/bindings.h @@ -56,6 +56,7 @@ extern ihandle_t open_package( const char *argstr, phandle_t ph ); extern ihandle_t open_dev( const char *spec ); extern void close_package( ihandle_t ih ); extern void close_dev( ihandle_t ih ); +extern char *get_path_from_ph( phandle_t ph ); /* property access */ extern void set_property( phandle_t ph, const char *name, |