Move hw/arm related sources
hw/boards.h, hw/devices.h -> include/hw/
hw/arm_pic.c -> hw/arm/pic.c
Change-Id: If2a0ac71e44b13e792704ff36885667709ac331a
diff --git a/hw/android_arm.c b/hw/android_arm.c
index 9f8006f..ac39626 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "hw/hw.h"
-#include "boards.h"
-#include "devices.h"
+#include "hw/boards.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "hw/arm/pic.h"
#include "sysemu/sysemu.h"
diff --git a/hw/android_mips.c b/hw/android_mips.c
index 160c682..fee4ec9 100644
--- a/hw/android_mips.c
+++ b/hw/android_mips.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "hw/hw.h"
-#include "boards.h"
-#include "devices.h"
+#include "hw/boards.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "mips.h"
diff --git a/hw/arm_pic.c b/hw/arm/pic.c
similarity index 100%
rename from hw/arm_pic.c
rename to hw/arm/pic.c
diff --git a/hw/boards.h b/hw/boards.h
deleted file mode 100644
index 8242af6..0000000
--- a/hw/boards.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Declarations for use by board files for creating devices. */
-
-#ifndef HW_BOARDS_H
-#define HW_BOARDS_H
-
-typedef void QEMUMachineInitFunc(ram_addr_t ram_size,
- const char *boot_device,
- const char *kernel_filename,
- const char *kernel_cmdline,
- const char *initrd_filename,
- const char *cpu_model);
-
-typedef struct QEMUMachine {
- const char *name;
- const char *desc;
- QEMUMachineInitFunc *init;
- int use_scsi;
- int max_cpus;
- int is_default;
- struct QEMUMachine *next;
-} QEMUMachine;
-
-int qemu_register_machine(QEMUMachine *m);
-
-extern QEMUMachine *current_machine;
-
-/* android_arm.c */
-extern QEMUMachine android_arm_machine;
-
-/* android_mips.c */
-extern QEMUMachine android_mips_machine;
-
-#endif
diff --git a/hw/devices.h b/hw/devices.h
deleted file mode 100644
index c788373..0000000
--- a/hw/devices.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef QEMU_DEVICES_H
-#define QEMU_DEVICES_H
-
-/* Devices that have nowhere better to go. */
-
-/* smc91c111.c */
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
-
-/* lan9118.c */
-void lan9118_init(NICInfo *, uint32_t, qemu_irq);
-
-/* tsc210x.c */
-uWireSlave *tsc2102_init(qemu_irq pint);
-uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav);
-I2SCodec *tsc210x_codec(uWireSlave *chip);
-uint32_t tsc210x_txrx(void *opaque, uint32_t value, int len);
-void tsc210x_set_transform(uWireSlave *chip,
- MouseTransformInfo *info);
-void tsc210x_key_event(uWireSlave *chip, int key, int down);
-
-/* tsc2005.c */
-void *tsc2005_init(qemu_irq pintdav);
-uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len);
-void tsc2005_set_transform(void *opaque, MouseTransformInfo *info);
-
-/* stellaris_input.c */
-void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode);
-
-/* blizzard.c */
-void *s1d13745_init(qemu_irq gpio_int);
-void s1d13745_write(void *opaque, int dc, uint16_t value);
-void s1d13745_write_block(void *opaque, int dc,
- void *buf, size_t len, int pitch);
-uint16_t s1d13745_read(void *opaque, int dc);
-
-/* cbus.c */
-typedef struct {
- qemu_irq clk;
- qemu_irq dat;
- qemu_irq sel;
-} CBus;
-CBus *cbus_init(qemu_irq dat_out);
-void cbus_attach(CBus *bus, void *slave_opaque);
-
-void *retu_init(qemu_irq irq, int vilma);
-void *tahvo_init(qemu_irq irq, int betty);
-
-void retu_key_event(void *retu, int state);
-
-/* tusb6010.c */
-typedef struct TUSBState TUSBState;
-TUSBState *tusb6010_init(qemu_irq intr);
-int tusb6010_sync_io(TUSBState *s);
-int tusb6010_async_io(TUSBState *s);
-void tusb6010_power(TUSBState *s, int on);
-
-/* tc6393xb.c */
-typedef struct TC6393xbState TC6393xbState;
-#define TC6393XB_RAM 0x110000 /* amount of ram for Video and USB */
-TC6393xbState *tc6393xb_init(uint32_t base, qemu_irq irq);
-void tc6393xb_gpio_out_set(TC6393xbState *s, int line,
- qemu_irq handler);
-qemu_irq *tc6393xb_gpio_in_get(TC6393xbState *s);
-qemu_irq tc6393xb_l3v_get(TC6393xbState *s);
-
-/* sm501.c */
-void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq,
- CharDriverState *chr);
-
-#endif
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5132e1f..acb2638 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -13,7 +13,7 @@
#include "hw/isa/isa.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
-#include "boards.h"
+#include "hw/boards.h"
#include "flash.h"
#include "qemu/log.h"
#include "mips-bios.h"
diff --git a/hw/pc.c b/hw/pc.c
index fa85eb6..8897898 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -31,7 +31,7 @@
#include "audio/audio.h"
#include "net/net.h"
//#include "smbus.h"
-#include "boards.h"
+#include "hw/boards.h"
#include "android/globals.h"
#include "monitor/monitor.h"
#include "fw_cfg.h"
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index bb67619..3ba10ca 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "devices.h"
+#include "hw/devices.h"
#include "hw/hw.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index d1dfd82..ca801bd 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -31,7 +31,7 @@
#include "usb.h"
#include "pci.h"
#include "pxa.h"
-#include "devices.h"
+#include "hw/devices.h"
//#define DEBUG_OHCI
/* Dump packet contents. */