move xbox hardware to hw/xbox

gl/gloffscreen.h

@@ -31,6 +31,10 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#elif defined(_WIN32)
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
 #else
 #include <GL/gl.h>
 #endif

hw/Makefile.objs

@@ -31,4 +31,4 @@ devices-dirs-y += core/
 common-obj-y += $(devices-dirs-y)
 obj-y += $(devices-dirs-y)
 
-obj-$(CONFIG_XBOX) += xbox_pci.o acpi_xbox.o amd_smbus.o nvnet.o nv2a.o nv2a_vsh.o mcpx_apu.o mcpx_aci.o smbus_xbox_smc.o smbus_cx25871.o smbus_adm1032.o lpc47m157.o
+obj-$(CONFIG_XBOX) += xbox/

hw/i386/Makefile.objs

@@ -3,6 +3,5 @@ obj-y += multiboot.o smbios.o
 obj-y += pc.o pc_piix.o pc_q35.o
 obj-y += pc_sysfw.o
 obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
-obj-$(CONFIG_XBOX) += xbox.o chihiro.o
 
 obj-y += kvmvapic.o

hw/xbox/Makefile.objs

@@ -0,0 +1,7 @@
+obj-y += xbox.o chihiro.o
+obj-y += xbox_pci.o acpi_xbox.o
+obj-y += amd_smbus.o smbus_xbox_smc.o smbus_cx25871.o smbus_adm1032.o
+obj-y += nvnet.o
+obj-y += nv2a.o nv2a_vsh.o
+obj-y += mcpx_apu.o mcpx_aci.o
+obj-y += lpc47m157.o

hw/xbox/acpi_xbox.c

@@ -29,9 +29,9 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/acpi/acpi.h"
-#include "hw/xbox_pci.h"
+#include "hw/xbox/xbox_pci.h"
 
-#include "hw/acpi_xbox.h"
+#include "hw/xbox/acpi_xbox.h"
 
 //#define DEBUG
 #ifdef DEBUG

hw/xbox/amd_smbus.c

@@ -24,7 +24,7 @@
 
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
-#include "hw/amd_smbus.h"
+#include "hw/xbox/amd_smbus.h"
 #include "hw/i2c/smbus.h"
 
 /* AMD756 SMBus address offsets */

hw/xbox/chihiro.c

@@ -26,7 +26,7 @@
 #include "qemu/config-file.h"
 #include "sysemu/blockdev.h"
 #include "block/blkmemory.h"
-#include "hw/xbox.h"
+#include "hw/xbox/xbox.h"
 
 
 #define SEGA_CHIP_REVISION                  0xF0

hw/xbox/mcpx_aci.c

@@ -21,7 +21,7 @@
 #include "hw/pci/pci.h"
 #include "hw/audio/ac97_int.h"
 
-#include "hw/mcpx_apu.h"
+#include "hw/xbox/mcpx_apu.h"
 
 typedef struct MCPXACIState {
     PCIDevice dev;

hw/xbox/mcpx_apu.c

@@ -20,7 +20,7 @@
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 
-#include "hw/mcpx_apu.h"
+#include "hw/xbox/mcpx_apu.h"
 
 
 

hw/xbox/nv2a.c

@@ -27,21 +27,10 @@
 #include "qapi/qmp/qstring.h"
 #include "gl/gloffscreen.h"
 
-#include "hw/u_format_r11g11b10f.h"
+#include "hw/xbox/u_format_r11g11b10f.h"
+#include "hw/xbox/nv2a_vsh.h"
 
-#include "hw/nv2a_vsh.h"
-
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#elif defined(_WIN32)
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#else
-#include <GL/gl.h>
-#endif
-
-#include "hw/nv2a.h"
+#include "hw/xbox/nv2a.h"
 
 #define DEBUG_NV2A
 #ifdef DEBUG_NV2A

hw/xbox/nv2a_vsh.c

@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "hw/nv2a_vsh.h"
+#include "hw/xbox/nv2a_vsh.h"
 
 
 #define VSH_TOKEN_SIZE 4

hw/xbox/nvnet.c

@@ -20,7 +20,7 @@
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 
-#include "hw/nvnet.h"
+#include "hw/xbox/nvnet.h"
 
 
 #define IOPORT_SIZE 0x8

hw/xbox/xbox.c

@@ -37,12 +37,12 @@
 #include "hw/loader.h"
 #include "exec/address-spaces.h"
 
-#include "hw/xbox_pci.h"
-#include "hw/nvnet.h"
-#include "hw/nv2a.h"
-#include "hw/mcpx_apu.h"
+#include "hw/xbox/xbox_pci.h"
+#include "hw/xbox/nvnet.h"
+#include "hw/xbox/nv2a.h"
+#include "hw/xbox/mcpx_apu.h"
 
-#include "hw/xbox.h"
+#include "hw/xbox/xbox.h"
 
 /* mostly from pc_memory_init */
 static void xbox_memory_init(MemoryRegion *system_memory,

hw/xbox/xbox_pci.c

@@ -27,12 +27,12 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_bridge.h"
 #include "exec/address-spaces.h"
-
-#include "hw/acpi_xbox.h"
-#include "hw/amd_smbus.h"
 #include "qemu-common.h"
 
-#include "hw/xbox_pci.h"
+#include "hw/xbox/acpi_xbox.h"
+#include "hw/xbox/amd_smbus.h"
+
+#include "hw/xbox/xbox_pci.h"
 
 
  /*

hw/xbox/xbox_pci.h

@@ -27,9 +27,9 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/amd_smbus.h"
+#include "hw/xbox/amd_smbus.h"
 #include "hw/acpi/acpi.h"
-#include "hw/acpi_xbox.h"
+#include "hw/xbox/acpi_xbox.h"
 
 
 typedef struct XBOX_PCIState {