merge includes into src/

Makefile

@@ -80,7 +80,7 @@ QEMU_INC=-I$(QEMU_INCDIR)/target-arm \
 	-I$(QEMU_INCDIR)/fpu \
 	-I$(QEMU_INCDIR)/arm-softmmu
 
-X49GP_INCLUDES = -I./src/include \
+X49GP_INCLUDES = -I./src \
 	-I./src/bitmaps $(QEMU_INC)
 
 INCLUDES = $(GDB_INCLUDES) $(X49GP_INCLUDES)

src/bitmaps.h

@@ -0,0 +1,21 @@
+/* $Id: bitmaps.h,v 1.9 2008/12/11 12:18:17 ecd Exp $
+ */
+
+#ifndef _X49GP_BITMAPS_H
+#define _X49GP_BITMAPS_H 1
+
+#include "bitmaps/ann_left.xbm"
+#include "bitmaps/ann_right.xbm"
+#include "bitmaps/ann_alpha.xbm"
+#include "bitmaps/ann_battery.xbm"
+#include "bitmaps/ann_busy.xbm"
+#include "bitmaps/ann_io.xbm"
+
+#include "bitmaps/button_tiny.xbm"
+#include "bitmaps/button_small.xbm"
+#include "bitmaps/button_normal.xbm"
+#include "bitmaps/button_large.xbm"
+#include "bitmaps/button_round.xbm"
+#include "bitmaps/button_round.pix"
+
+#endif /* !(_X49GP_BITMAPS_H) */

src/block-qcow.c

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 #include "qemu-git/qemu-common.h"
-#include "include/block.h"
+#include "block.h"
-#include "include/block_int.h"
+#include "block_int.h"
 #include <zlib.h>
 #if 0
 #include "aes.h"

src/block-raw.c

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 #include "qemu-git/qemu-common.h"
-#include "include/block.h"
+#include "block.h"
-#include "include/block_int.h"
+#include "block_int.h"
 #include <assert.h>
 #ifndef _WIN32
 

src/block.c

@@ -9,8 +9,8 @@
 #include <sys/stat.h>
 
 #include "qemu-git/qemu-common.h"
-#include "include/block.h"
+#include "block.h"
-#include "include/block_int.h"
+#include "block_int.h"
 
 #define SECTOR_BITS	9
 #define SECTOR_SIZE	(1 << SECTOR_BITS)

src/block_int.h

@@ -24,6 +24,9 @@
 #ifndef BLOCK_INT_H
 #define BLOCK_INT_H
 
+#  include "qemu-git/qemu-common.h"
+#  include "block.h"
+
 struct BlockDriver {
     const char *format_name;
     int instance_size;

src/flash.c

@@ -15,9 +15,9 @@
 #include <glib.h>
 #include <cairo.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/x49gp_ui.h"
+#include "x49gp_ui.h"
-#include "include/byteorder.h"
+#include "byteorder.h"
 
 #define FLASH_STATE_NORMAL		0
 

src/gdbstub.c

@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
 #include "gdbstub.h"
 
 #define MAX_PACKET_LENGTH 4096

src/include/bitmaps.h

@@ -1,21 +0,0 @@
-/* $Id: bitmaps.h,v 1.9 2008/12/11 12:18:17 ecd Exp $
- */
-
-#ifndef _X49GP_BITMAPS_H
-#define _X49GP_BITMAPS_H 1
-
-#include <ann_left.xbm>
-#include <ann_right.xbm>
-#include <ann_alpha.xbm>
-#include <ann_battery.xbm>
-#include <ann_busy.xbm>
-#include <ann_io.xbm>
-
-#include <button_tiny.xbm>
-#include <button_small.xbm>
-#include <button_normal.xbm>
-#include <button_large.xbm>
-#include <button_round.xbm>
-#include <button_round.pix>
-
-#endif /* !(_X49GP_BITMAPS_H) */

src/main.c

@@ -17,12 +17,12 @@
 
 #include <memory.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/x49gp_ui.h"
+#include "x49gp_ui.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_power.h"
+#include "s3c2410_power.h"
-#include "include/s3c2410_timer.h"
+#include "s3c2410_timer.h"
-#include "include/x49gp_timer.h"
+#include "x49gp_timer.h"
 
 #include "gdbstub.h"
 

src/module.c

@@ -9,7 +9,7 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
 
 int
 x49gp_modules_init(x49gp_t *x49gp)

src/s3c2410.c

@@ -10,8 +10,8 @@
 #include <sys/times.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 /*
  * Boot SRAM:			0x40000000

src/s3c2410.h

@@ -4,7 +4,7 @@
 #ifndef _X49GP_S3C2410_H
 #define _X49GP_S3C2410_H 1
 
-#include <x49gp_types.h>
+#include "x49gp_types.h"
 
 typedef struct {
 	const char	*name;

src/s3c2410_adc.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 
 typedef struct {

src/s3c2410_arm.c

@@ -10,8 +10,8 @@
 
 #include "qemu-git/target-arm/cpu.h"
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 #include "qemu-git/cpu-all.h"
 

src/s3c2410_intc.c

@@ -7,11 +7,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
-#include "include/s3c2410_power.h"
+#include "s3c2410_power.h"
-#include "include/byteorder.h"
+#include "byteorder.h"
 
 extern int do_trace;
 

src/s3c2410_io_port.c

@@ -7,10 +7,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
-#include "include/byteorder.h"
+#include "byteorder.h"
 
 
 typedef struct {

src/s3c2410_lcd.c

@@ -11,9 +11,9 @@
 
 #include <gtk/gtk.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/x49gp_ui.h"
+#include "x49gp_ui.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 
 typedef struct {

src/s3c2410_memc.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 
 typedef struct {

src/s3c2410_nand.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 
 typedef struct {

src/s3c2410_power.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_power.h"
+#include "s3c2410_power.h"
 
 static const uint32_t EXTCLK = 12000000;
 

src/s3c2410_rtc.c

@@ -10,9 +10,9 @@
 #include <time.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_sdi.c

@@ -10,10 +10,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
-#include "include/block.h"
+#include "block.h"
 
 //#define DEBUG_S3C2410_SDI 1
 

src/s3c2410_spi.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_sram.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/byteorder.h"
+#include "byteorder.h"
 
 typedef struct {
 	void		*data;

src/s3c2410_timer.c

@@ -9,10 +9,10 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_timer.h"
+#include "s3c2410_timer.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_timer.h

@@ -4,7 +4,7 @@
 #ifndef _S3C2410_TIMER_H
 #define _S3C2410_TIMER_H 1
 
-#include <x49gp_types.h>
+#include "x49gp_types.h"
 
 #define TCFG0_DEAD_SHIFT	16
 #define TCFG0_DEAD_MASK		0xff

src/s3c2410_uart.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
 
 
 typedef struct {

src/s3c2410_usbdev.c

@@ -9,8 +9,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 
 typedef struct {

src/s3c2410_watchdog.c

@@ -9,9 +9,9 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/s3c2410_intc.h"
+#include "s3c2410_intc.h"
 
 
 typedef struct {

src/sram.c

@@ -11,10 +11,10 @@
 
 #include <memory.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/byteorder.h"
+#include "byteorder.h"
 
-#include "include/saturn.h"
+#include "saturn.h"
 
 typedef struct {
 	void		*data;

src/symbol.c

@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <cairo.h>
 
-#include "include/symbol.h"
+#include "symbol.h"
 
 static const cairo_path_data_t symbol_square_path_data[] =
 {

src/timer.c

@@ -16,9 +16,9 @@
 
 #include <glib.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/x49gp_timer.h"
+#include "x49gp_timer.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
 
 #include "gdbstub.h"
 

src/tiny_font.c

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 
-#include "include/bitmap_font.h"
+#include "bitmap_font.h"
 
 #include "bitmaps/tiny_notdef.xbm"
 

src/ui.c

@@ -18,13 +18,13 @@
 #include <cairo.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "include/x49gp.h"
+#include "x49gp.h"
-#include "include/x49gp_ui.h"
+#include "x49gp_ui.h"
-#include "include/s3c2410.h"
+#include "s3c2410.h"
-#include "include/bitmaps.h"
+#include "bitmaps.h"
-#include "include/bitmap_font.h"
+#include "bitmap_font.h"
-#include "include/symbol.h"
+#include "symbol.h"
-#include "include/glyphname.h"
+#include "glyphname.h"
 
 #include "gdbstub.h"
 
@@ -3523,9 +3523,8 @@ int x49gp_ui_init( x49gp_t* x49gp )
 {
     x49gp_module_t* module;
 
-    if ( x49gp_module_init( x49gp, "gui", gui_init, gui_exit, gui_reset, gui_load, gui_save, NULL, &module ) ) {
+    if ( x49gp_module_init( x49gp, "gui", gui_init, gui_exit, gui_reset, gui_load, gui_save, NULL, &module ) )
 	return -1;
-    }
 
     return x49gp_module_register( module );
 }

src/x49gp.h

@@ -10,13 +10,14 @@
 
 #include <glib.h>
 
-#include <cpu.h>
-
-#include <x49gp_types.h>
-#include <x49gp_timer.h>
-#include <s3c2410_mmu.h>
 #include <memory.h>
-#include <list.h>
+
+#include "qemu-git/target-arm/cpu.h"
+
+#include "x49gp_types.h"
+#include "x49gp_timer.h"
+#include "s3c2410_mmu.h"
+#include "list.h"
 
 /* LD TEMPO HACK */
 extern uint8_t *phys_ram_base;

src/x49gp_timer.h

@@ -5,7 +5,8 @@
 #define _X49GP_TIMER_H 1
 
 #include <time.h>
-#include <list.h>
+
+#include "list.h"
 
 #define X49GP_TIMER_VIRTUAL	0
 #define X49GP_TIMER_REALTIME	1

src/x49gp_ui.h

@@ -4,7 +4,7 @@
 #ifndef _X49GP_UI_H
 #define _X49GP_UI_H 1
 
-#include <x49gp_types.h>
+#include "x49gp_types.h"
 
 typedef enum {
 	UI_COLOR_BLACK = 0,