diff --git a/Makefile b/Makefile index cad6d6a..3239cb7 100644 --- a/Makefile +++ b/Makefile @@ -76,8 +76,9 @@ X49GP_DEBUG = \ -DDEBUG_X49GP_MAIN \ -DDEBUG_X49GP_UI -X49GP_INCLUDES = -I./src \ - -I./src/bitmaps \ +X49GP_INCLUDES = -I./src/x49gpng/ \ + -I./src/x49gpng/bitmaps/ \ + -I./src/qemu-git/ \ $(QEMU_INCLUDES) X49GP_CFLAGS = $(CFLAGS) \ @@ -102,41 +103,41 @@ endif X49GP_LDFLAGS = $(DEBUG_CFLAGS) $(LDFLAGS) X49GP_LDLIBS = $(QEMU_OBJS) $(GDB_LIBS) $(COCOA_LIBS) $(GTK_LDLIBS) -SRCS = ./src/main.c \ - ./src/module.c \ - ./src/flash.c \ - ./src/sram.c \ - ./src/s3c2410.c \ - ./src/s3c2410_sram.c \ - ./src/s3c2410_memc.c \ - ./src/s3c2410_intc.c \ - ./src/s3c2410_power.c \ - ./src/s3c2410_lcd.c \ - ./src/s3c2410_nand.c \ - ./src/s3c2410_uart.c \ - ./src/s3c2410_timer.c \ - ./src/s3c2410_usbdev.c \ - ./src/s3c2410_watchdog.c \ - ./src/s3c2410_io_port.c \ - ./src/s3c2410_rtc.c \ - ./src/s3c2410_adc.c \ - ./src/s3c2410_spi.c \ - ./src/s3c2410_sdi.c \ - ./src/s3c2410_arm.c \ - ./src/ui.c \ - ./src/timer.c \ - ./src/tiny_font.c \ - ./src/symbol.c \ - ./src/gdbstub.c \ - ./src/block.c \ - ./src/options.c +SRCS = ./src/x49gpng/main.c \ + ./src/x49gpng/module.c \ + ./src/x49gpng/flash.c \ + ./src/x49gpng/sram.c \ + ./src/x49gpng/s3c2410.c \ + ./src/x49gpng/s3c2410_sram.c \ + ./src/x49gpng/s3c2410_memc.c \ + ./src/x49gpng/s3c2410_intc.c \ + ./src/x49gpng/s3c2410_power.c \ + ./src/x49gpng/s3c2410_lcd.c \ + ./src/x49gpng/s3c2410_nand.c \ + ./src/x49gpng/s3c2410_uart.c \ + ./src/x49gpng/s3c2410_timer.c \ + ./src/x49gpng/s3c2410_usbdev.c \ + ./src/x49gpng/s3c2410_watchdog.c \ + ./src/x49gpng/s3c2410_io_port.c \ + ./src/x49gpng/s3c2410_rtc.c \ + ./src/x49gpng/s3c2410_adc.c \ + ./src/x49gpng/s3c2410_spi.c \ + ./src/x49gpng/s3c2410_sdi.c \ + ./src/x49gpng/s3c2410_arm.c \ + ./src/x49gpng/ui.c \ + ./src/x49gpng/timer.c \ + ./src/x49gpng/tiny_font.c \ + ./src/x49gpng/symbol.c \ + ./src/x49gpng/gdbstub.c \ + ./src/x49gpng/block.c \ + ./src/x49gpng/options.c OBJS = $(SRCS:.c=.o) # TEMPO hack -VVFATOBJS = ./src/block-vvfat.o \ - ./src/block-qcow.o \ - ./src/block-raw.o \ +VVFATOBJS = ./src/x49gpng/block-vvfat.o \ + ./src/x49gpng/block-qcow.o \ + ./src/x49gpng/block-raw.o \ $(QEMU_DIR)/cutils.o all: do-it-all @@ -155,7 +156,7 @@ dist/$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU_OBJS) %.o: %.c $(CC) $(X49GP_CFLAGS) -o $@ -c $< -./src/block-vvfat.o: ./src/block-vvfat.c +./src/x49gpng/block-vvfat.o: ./src/x49gpng/block-vvfat.c $(CC) $(X49GP_CFLAGS) -fno-aggressive-loop-optimizations -o $@ -c $< # Compilation of qemu-git @@ -183,7 +184,7 @@ clean-qemu: $(MAKE) -C $(QEMU_DIR) -f Makefile-small clean clean: clean-qemu - rm -f ./src/*.o core *~ .depend + rm -f ./src/x49gpng/*.o core *~ .depend distclean: clean $(MAKE) -C $(QEMU_DIR) -f Makefile-small distclean @@ -194,7 +195,7 @@ mrproper: clean-qemu distclean # auto-format code pretty-code: - clang-format -i ./src/*.c ./src/*.h + clang-format -i ./src/x49gpng/*.c ./src/x49gpng/*.h # Populate dist/firmware/ from hpcalc.org pull-firmware: diff --git a/src/bitmap_font.h b/src/x49gpng/bitmap_font.h similarity index 100% rename from src/bitmap_font.h rename to src/x49gpng/bitmap_font.h diff --git a/src/bitmaps.h b/src/x49gpng/bitmaps.h similarity index 100% rename from src/bitmaps.h rename to src/x49gpng/bitmaps.h diff --git a/src/bitmaps/ann_alpha.xbm b/src/x49gpng/bitmaps/ann_alpha.xbm similarity index 100% rename from src/bitmaps/ann_alpha.xbm rename to src/x49gpng/bitmaps/ann_alpha.xbm diff --git a/src/bitmaps/ann_battery.xbm b/src/x49gpng/bitmaps/ann_battery.xbm similarity index 100% rename from src/bitmaps/ann_battery.xbm rename to src/x49gpng/bitmaps/ann_battery.xbm diff --git a/src/bitmaps/ann_busy.xbm b/src/x49gpng/bitmaps/ann_busy.xbm similarity index 100% rename from src/bitmaps/ann_busy.xbm rename to src/x49gpng/bitmaps/ann_busy.xbm diff --git a/src/bitmaps/ann_io.xbm b/src/x49gpng/bitmaps/ann_io.xbm similarity index 100% rename from src/bitmaps/ann_io.xbm rename to src/x49gpng/bitmaps/ann_io.xbm diff --git a/src/bitmaps/ann_left.xbm b/src/x49gpng/bitmaps/ann_left.xbm similarity index 100% rename from src/bitmaps/ann_left.xbm rename to src/x49gpng/bitmaps/ann_left.xbm diff --git a/src/bitmaps/ann_right.xbm b/src/x49gpng/bitmaps/ann_right.xbm similarity index 100% rename from src/bitmaps/ann_right.xbm rename to src/x49gpng/bitmaps/ann_right.xbm diff --git a/src/bitmaps/button_large.xbm b/src/x49gpng/bitmaps/button_large.xbm similarity index 100% rename from src/bitmaps/button_large.xbm rename to src/x49gpng/bitmaps/button_large.xbm diff --git a/src/bitmaps/button_normal.xbm b/src/x49gpng/bitmaps/button_normal.xbm similarity index 100% rename from src/bitmaps/button_normal.xbm rename to src/x49gpng/bitmaps/button_normal.xbm diff --git a/src/bitmaps/button_round.pix b/src/x49gpng/bitmaps/button_round.pix similarity index 100% rename from src/bitmaps/button_round.pix rename to src/x49gpng/bitmaps/button_round.pix diff --git a/src/bitmaps/button_round.xbm b/src/x49gpng/bitmaps/button_round.xbm similarity index 100% rename from src/bitmaps/button_round.xbm rename to src/x49gpng/bitmaps/button_round.xbm diff --git a/src/bitmaps/button_small.xbm b/src/x49gpng/bitmaps/button_small.xbm similarity index 100% rename from src/bitmaps/button_small.xbm rename to src/x49gpng/bitmaps/button_small.xbm diff --git a/src/bitmaps/button_tiny.xbm b/src/x49gpng/bitmaps/button_tiny.xbm similarity index 100% rename from src/bitmaps/button_tiny.xbm rename to src/x49gpng/bitmaps/button_tiny.xbm diff --git a/src/bitmaps/tiny_A.xbm b/src/x49gpng/bitmaps/tiny_A.xbm similarity index 100% rename from src/bitmaps/tiny_A.xbm rename to src/x49gpng/bitmaps/tiny_A.xbm diff --git a/src/bitmaps/tiny_B.xbm b/src/x49gpng/bitmaps/tiny_B.xbm similarity index 100% rename from src/bitmaps/tiny_B.xbm rename to src/x49gpng/bitmaps/tiny_B.xbm diff --git a/src/bitmaps/tiny_C.xbm b/src/x49gpng/bitmaps/tiny_C.xbm similarity index 100% rename from src/bitmaps/tiny_C.xbm rename to src/x49gpng/bitmaps/tiny_C.xbm diff --git a/src/bitmaps/tiny_D.xbm b/src/x49gpng/bitmaps/tiny_D.xbm similarity index 100% rename from src/bitmaps/tiny_D.xbm rename to src/x49gpng/bitmaps/tiny_D.xbm diff --git a/src/bitmaps/tiny_E.xbm b/src/x49gpng/bitmaps/tiny_E.xbm similarity index 100% rename from src/bitmaps/tiny_E.xbm rename to src/x49gpng/bitmaps/tiny_E.xbm diff --git a/src/bitmaps/tiny_F.xbm b/src/x49gpng/bitmaps/tiny_F.xbm similarity index 100% rename from src/bitmaps/tiny_F.xbm rename to src/x49gpng/bitmaps/tiny_F.xbm diff --git a/src/bitmaps/tiny_G.xbm b/src/x49gpng/bitmaps/tiny_G.xbm similarity index 100% rename from src/bitmaps/tiny_G.xbm rename to src/x49gpng/bitmaps/tiny_G.xbm diff --git a/src/bitmaps/tiny_H.xbm b/src/x49gpng/bitmaps/tiny_H.xbm similarity index 100% rename from src/bitmaps/tiny_H.xbm rename to src/x49gpng/bitmaps/tiny_H.xbm diff --git a/src/bitmaps/tiny_I.xbm b/src/x49gpng/bitmaps/tiny_I.xbm similarity index 100% rename from src/bitmaps/tiny_I.xbm rename to src/x49gpng/bitmaps/tiny_I.xbm diff --git a/src/bitmaps/tiny_J.xbm b/src/x49gpng/bitmaps/tiny_J.xbm similarity index 100% rename from src/bitmaps/tiny_J.xbm rename to src/x49gpng/bitmaps/tiny_J.xbm diff --git a/src/bitmaps/tiny_K.xbm b/src/x49gpng/bitmaps/tiny_K.xbm similarity index 100% rename from src/bitmaps/tiny_K.xbm rename to src/x49gpng/bitmaps/tiny_K.xbm diff --git a/src/bitmaps/tiny_L.xbm b/src/x49gpng/bitmaps/tiny_L.xbm similarity index 100% rename from src/bitmaps/tiny_L.xbm rename to src/x49gpng/bitmaps/tiny_L.xbm diff --git a/src/bitmaps/tiny_M.xbm b/src/x49gpng/bitmaps/tiny_M.xbm similarity index 100% rename from src/bitmaps/tiny_M.xbm rename to src/x49gpng/bitmaps/tiny_M.xbm diff --git a/src/bitmaps/tiny_N.xbm b/src/x49gpng/bitmaps/tiny_N.xbm similarity index 100% rename from src/bitmaps/tiny_N.xbm rename to src/x49gpng/bitmaps/tiny_N.xbm diff --git a/src/bitmaps/tiny_O.xbm b/src/x49gpng/bitmaps/tiny_O.xbm similarity index 100% rename from src/bitmaps/tiny_O.xbm rename to src/x49gpng/bitmaps/tiny_O.xbm diff --git a/src/bitmaps/tiny_P.xbm b/src/x49gpng/bitmaps/tiny_P.xbm similarity index 100% rename from src/bitmaps/tiny_P.xbm rename to src/x49gpng/bitmaps/tiny_P.xbm diff --git a/src/bitmaps/tiny_Q.xbm b/src/x49gpng/bitmaps/tiny_Q.xbm similarity index 100% rename from src/bitmaps/tiny_Q.xbm rename to src/x49gpng/bitmaps/tiny_Q.xbm diff --git a/src/bitmaps/tiny_R.xbm b/src/x49gpng/bitmaps/tiny_R.xbm similarity index 100% rename from src/bitmaps/tiny_R.xbm rename to src/x49gpng/bitmaps/tiny_R.xbm diff --git a/src/bitmaps/tiny_S.xbm b/src/x49gpng/bitmaps/tiny_S.xbm similarity index 100% rename from src/bitmaps/tiny_S.xbm rename to src/x49gpng/bitmaps/tiny_S.xbm diff --git a/src/bitmaps/tiny_T.xbm b/src/x49gpng/bitmaps/tiny_T.xbm similarity index 100% rename from src/bitmaps/tiny_T.xbm rename to src/x49gpng/bitmaps/tiny_T.xbm diff --git a/src/bitmaps/tiny_U.xbm b/src/x49gpng/bitmaps/tiny_U.xbm similarity index 100% rename from src/bitmaps/tiny_U.xbm rename to src/x49gpng/bitmaps/tiny_U.xbm diff --git a/src/bitmaps/tiny_V.xbm b/src/x49gpng/bitmaps/tiny_V.xbm similarity index 100% rename from src/bitmaps/tiny_V.xbm rename to src/x49gpng/bitmaps/tiny_V.xbm diff --git a/src/bitmaps/tiny_W.xbm b/src/x49gpng/bitmaps/tiny_W.xbm similarity index 100% rename from src/bitmaps/tiny_W.xbm rename to src/x49gpng/bitmaps/tiny_W.xbm diff --git a/src/bitmaps/tiny_X.xbm b/src/x49gpng/bitmaps/tiny_X.xbm similarity index 100% rename from src/bitmaps/tiny_X.xbm rename to src/x49gpng/bitmaps/tiny_X.xbm diff --git a/src/bitmaps/tiny_Y.xbm b/src/x49gpng/bitmaps/tiny_Y.xbm similarity index 100% rename from src/bitmaps/tiny_Y.xbm rename to src/x49gpng/bitmaps/tiny_Y.xbm diff --git a/src/bitmaps/tiny_Z.xbm b/src/x49gpng/bitmaps/tiny_Z.xbm similarity index 100% rename from src/bitmaps/tiny_Z.xbm rename to src/x49gpng/bitmaps/tiny_Z.xbm diff --git a/src/bitmaps/tiny__i.xbm b/src/x49gpng/bitmaps/tiny__i.xbm similarity index 100% rename from src/bitmaps/tiny__i.xbm rename to src/x49gpng/bitmaps/tiny__i.xbm diff --git a/src/bitmaps/tiny_ampersand.xbm b/src/x49gpng/bitmaps/tiny_ampersand.xbm similarity index 100% rename from src/bitmaps/tiny_ampersand.xbm rename to src/x49gpng/bitmaps/tiny_ampersand.xbm diff --git a/src/bitmaps/tiny_arrowleft.xbm b/src/x49gpng/bitmaps/tiny_arrowleft.xbm similarity index 100% rename from src/bitmaps/tiny_arrowleft.xbm rename to src/x49gpng/bitmaps/tiny_arrowleft.xbm diff --git a/src/bitmaps/tiny_arrowright.xbm b/src/x49gpng/bitmaps/tiny_arrowright.xbm similarity index 100% rename from src/bitmaps/tiny_arrowright.xbm rename to src/x49gpng/bitmaps/tiny_arrowright.xbm diff --git a/src/bitmaps/tiny_braceleft.xbm b/src/x49gpng/bitmaps/tiny_braceleft.xbm similarity index 100% rename from src/bitmaps/tiny_braceleft.xbm rename to src/x49gpng/bitmaps/tiny_braceleft.xbm diff --git a/src/bitmaps/tiny_braceright.xbm b/src/x49gpng/bitmaps/tiny_braceright.xbm similarity index 100% rename from src/bitmaps/tiny_braceright.xbm rename to src/x49gpng/bitmaps/tiny_braceright.xbm diff --git a/src/bitmaps/tiny_bracketleft.xbm b/src/x49gpng/bitmaps/tiny_bracketleft.xbm similarity index 100% rename from src/bitmaps/tiny_bracketleft.xbm rename to src/x49gpng/bitmaps/tiny_bracketleft.xbm diff --git a/src/bitmaps/tiny_bracketright.xbm b/src/x49gpng/bitmaps/tiny_bracketright.xbm similarity index 100% rename from src/bitmaps/tiny_bracketright.xbm rename to src/x49gpng/bitmaps/tiny_bracketright.xbm diff --git a/src/bitmaps/tiny_colon.xbm b/src/x49gpng/bitmaps/tiny_colon.xbm similarity index 100% rename from src/bitmaps/tiny_colon.xbm rename to src/x49gpng/bitmaps/tiny_colon.xbm diff --git a/src/bitmaps/tiny_comma.xbm b/src/x49gpng/bitmaps/tiny_comma.xbm similarity index 100% rename from src/bitmaps/tiny_comma.xbm rename to src/x49gpng/bitmaps/tiny_comma.xbm diff --git a/src/bitmaps/tiny_equal.xbm b/src/x49gpng/bitmaps/tiny_equal.xbm similarity index 100% rename from src/bitmaps/tiny_equal.xbm rename to src/x49gpng/bitmaps/tiny_equal.xbm diff --git a/src/bitmaps/tiny_greater.xbm b/src/x49gpng/bitmaps/tiny_greater.xbm similarity index 100% rename from src/bitmaps/tiny_greater.xbm rename to src/x49gpng/bitmaps/tiny_greater.xbm diff --git a/src/bitmaps/tiny_guillemotleft.xbm b/src/x49gpng/bitmaps/tiny_guillemotleft.xbm similarity index 100% rename from src/bitmaps/tiny_guillemotleft.xbm rename to src/x49gpng/bitmaps/tiny_guillemotleft.xbm diff --git a/src/bitmaps/tiny_guillemotright.xbm b/src/x49gpng/bitmaps/tiny_guillemotright.xbm similarity index 100% rename from src/bitmaps/tiny_guillemotright.xbm rename to src/x49gpng/bitmaps/tiny_guillemotright.xbm diff --git a/src/bitmaps/tiny_hyphen.xbm b/src/x49gpng/bitmaps/tiny_hyphen.xbm similarity index 100% rename from src/bitmaps/tiny_hyphen.xbm rename to src/x49gpng/bitmaps/tiny_hyphen.xbm diff --git a/src/bitmaps/tiny_large_comma.xbm b/src/x49gpng/bitmaps/tiny_large_comma.xbm similarity index 100% rename from src/bitmaps/tiny_large_comma.xbm rename to src/x49gpng/bitmaps/tiny_large_comma.xbm diff --git a/src/bitmaps/tiny_less.xbm b/src/x49gpng/bitmaps/tiny_less.xbm similarity index 100% rename from src/bitmaps/tiny_less.xbm rename to src/x49gpng/bitmaps/tiny_less.xbm diff --git a/src/bitmaps/tiny_math_arrowleft.xbm b/src/x49gpng/bitmaps/tiny_math_arrowleft.xbm similarity index 100% rename from src/bitmaps/tiny_math_arrowleft.xbm rename to src/x49gpng/bitmaps/tiny_math_arrowleft.xbm diff --git a/src/bitmaps/tiny_math_arrowright.xbm b/src/x49gpng/bitmaps/tiny_math_arrowright.xbm similarity index 100% rename from src/bitmaps/tiny_math_arrowright.xbm rename to src/x49gpng/bitmaps/tiny_math_arrowright.xbm diff --git a/src/bitmaps/tiny_math_downarrowleft.xbm b/src/x49gpng/bitmaps/tiny_math_downarrowleft.xbm similarity index 100% rename from src/bitmaps/tiny_math_downarrowleft.xbm rename to src/x49gpng/bitmaps/tiny_math_downarrowleft.xbm diff --git a/src/bitmaps/tiny_math_downarrowright.xbm b/src/x49gpng/bitmaps/tiny_math_downarrowright.xbm similarity index 100% rename from src/bitmaps/tiny_math_downarrowright.xbm rename to src/x49gpng/bitmaps/tiny_math_downarrowright.xbm diff --git a/src/bitmaps/tiny_math_e.xbm b/src/x49gpng/bitmaps/tiny_math_e.xbm similarity index 100% rename from src/bitmaps/tiny_math_e.xbm rename to src/x49gpng/bitmaps/tiny_math_e.xbm diff --git a/src/bitmaps/tiny_math_equal.xbm b/src/x49gpng/bitmaps/tiny_math_equal.xbm similarity index 100% rename from src/bitmaps/tiny_math_equal.xbm rename to src/x49gpng/bitmaps/tiny_math_equal.xbm diff --git a/src/bitmaps/tiny_math_greater.xbm b/src/x49gpng/bitmaps/tiny_math_greater.xbm similarity index 100% rename from src/bitmaps/tiny_math_greater.xbm rename to src/x49gpng/bitmaps/tiny_math_greater.xbm diff --git a/src/bitmaps/tiny_math_greaterequal.xbm b/src/x49gpng/bitmaps/tiny_math_greaterequal.xbm similarity index 100% rename from src/bitmaps/tiny_math_greaterequal.xbm rename to src/x49gpng/bitmaps/tiny_math_greaterequal.xbm diff --git a/src/bitmaps/tiny_math_infinity.xbm b/src/x49gpng/bitmaps/tiny_math_infinity.xbm similarity index 100% rename from src/bitmaps/tiny_math_infinity.xbm rename to src/x49gpng/bitmaps/tiny_math_infinity.xbm diff --git a/src/bitmaps/tiny_math_integral.xbm b/src/x49gpng/bitmaps/tiny_math_integral.xbm similarity index 100% rename from src/bitmaps/tiny_math_integral.xbm rename to src/x49gpng/bitmaps/tiny_math_integral.xbm diff --git a/src/bitmaps/tiny_math_less.xbm b/src/x49gpng/bitmaps/tiny_math_less.xbm similarity index 100% rename from src/bitmaps/tiny_math_less.xbm rename to src/x49gpng/bitmaps/tiny_math_less.xbm diff --git a/src/bitmaps/tiny_math_lessequal.xbm b/src/x49gpng/bitmaps/tiny_math_lessequal.xbm similarity index 100% rename from src/bitmaps/tiny_math_lessequal.xbm rename to src/x49gpng/bitmaps/tiny_math_lessequal.xbm diff --git a/src/bitmaps/tiny_math_notequal.xbm b/src/x49gpng/bitmaps/tiny_math_notequal.xbm similarity index 100% rename from src/bitmaps/tiny_math_notequal.xbm rename to src/x49gpng/bitmaps/tiny_math_notequal.xbm diff --git a/src/bitmaps/tiny_math_numbersign.xbm b/src/x49gpng/bitmaps/tiny_math_numbersign.xbm similarity index 100% rename from src/bitmaps/tiny_math_numbersign.xbm rename to src/x49gpng/bitmaps/tiny_math_numbersign.xbm diff --git a/src/bitmaps/tiny_math_partialdiff.xbm b/src/x49gpng/bitmaps/tiny_math_partialdiff.xbm similarity index 100% rename from src/bitmaps/tiny_math_partialdiff.xbm rename to src/x49gpng/bitmaps/tiny_math_partialdiff.xbm diff --git a/src/bitmaps/tiny_math_pi.xbm b/src/x49gpng/bitmaps/tiny_math_pi.xbm similarity index 100% rename from src/bitmaps/tiny_math_pi.xbm rename to src/x49gpng/bitmaps/tiny_math_pi.xbm diff --git a/src/bitmaps/tiny_math_radical.xbm b/src/x49gpng/bitmaps/tiny_math_radical.xbm similarity index 100% rename from src/bitmaps/tiny_math_radical.xbm rename to src/x49gpng/bitmaps/tiny_math_radical.xbm diff --git a/src/bitmaps/tiny_math_summation.xbm b/src/x49gpng/bitmaps/tiny_math_summation.xbm similarity index 100% rename from src/bitmaps/tiny_math_summation.xbm rename to src/x49gpng/bitmaps/tiny_math_summation.xbm diff --git a/src/bitmaps/tiny_math_x.xbm b/src/x49gpng/bitmaps/tiny_math_x.xbm similarity index 100% rename from src/bitmaps/tiny_math_x.xbm rename to src/x49gpng/bitmaps/tiny_math_x.xbm diff --git a/src/bitmaps/tiny_math_y.xbm b/src/x49gpng/bitmaps/tiny_math_y.xbm similarity index 100% rename from src/bitmaps/tiny_math_y.xbm rename to src/x49gpng/bitmaps/tiny_math_y.xbm diff --git a/src/bitmaps/tiny_notdef.xbm b/src/x49gpng/bitmaps/tiny_notdef.xbm similarity index 100% rename from src/bitmaps/tiny_notdef.xbm rename to src/x49gpng/bitmaps/tiny_notdef.xbm diff --git a/src/bitmaps/tiny_numbersign.xbm b/src/x49gpng/bitmaps/tiny_numbersign.xbm similarity index 100% rename from src/bitmaps/tiny_numbersign.xbm rename to src/x49gpng/bitmaps/tiny_numbersign.xbm diff --git a/src/bitmaps/tiny_one.xbm b/src/x49gpng/bitmaps/tiny_one.xbm similarity index 100% rename from src/bitmaps/tiny_one.xbm rename to src/x49gpng/bitmaps/tiny_one.xbm diff --git a/src/bitmaps/tiny_overscore.xbm b/src/x49gpng/bitmaps/tiny_overscore.xbm similarity index 100% rename from src/bitmaps/tiny_overscore.xbm rename to src/x49gpng/bitmaps/tiny_overscore.xbm diff --git a/src/bitmaps/tiny_parenleft.xbm b/src/x49gpng/bitmaps/tiny_parenleft.xbm similarity index 100% rename from src/bitmaps/tiny_parenleft.xbm rename to src/x49gpng/bitmaps/tiny_parenleft.xbm diff --git a/src/bitmaps/tiny_parenright.xbm b/src/x49gpng/bitmaps/tiny_parenright.xbm similarity index 100% rename from src/bitmaps/tiny_parenright.xbm rename to src/x49gpng/bitmaps/tiny_parenright.xbm diff --git a/src/bitmaps/tiny_period.xbm b/src/x49gpng/bitmaps/tiny_period.xbm similarity index 100% rename from src/bitmaps/tiny_period.xbm rename to src/x49gpng/bitmaps/tiny_period.xbm diff --git a/src/bitmaps/tiny_quotedbl.xbm b/src/x49gpng/bitmaps/tiny_quotedbl.xbm similarity index 100% rename from src/bitmaps/tiny_quotedbl.xbm rename to src/x49gpng/bitmaps/tiny_quotedbl.xbm diff --git a/src/bitmaps/tiny_slash.xbm b/src/x49gpng/bitmaps/tiny_slash.xbm similarity index 100% rename from src/bitmaps/tiny_slash.xbm rename to src/x49gpng/bitmaps/tiny_slash.xbm diff --git a/src/bitmaps/tiny_three.xbm b/src/x49gpng/bitmaps/tiny_three.xbm similarity index 100% rename from src/bitmaps/tiny_three.xbm rename to src/x49gpng/bitmaps/tiny_three.xbm diff --git a/src/bitmaps/tiny_two.xbm b/src/x49gpng/bitmaps/tiny_two.xbm similarity index 100% rename from src/bitmaps/tiny_two.xbm rename to src/x49gpng/bitmaps/tiny_two.xbm diff --git a/src/bitmaps/tiny_twosuperior.xbm b/src/x49gpng/bitmaps/tiny_twosuperior.xbm similarity index 100% rename from src/bitmaps/tiny_twosuperior.xbm rename to src/x49gpng/bitmaps/tiny_twosuperior.xbm diff --git a/src/bitmaps/tiny_underscore.xbm b/src/x49gpng/bitmaps/tiny_underscore.xbm similarity index 100% rename from src/bitmaps/tiny_underscore.xbm rename to src/x49gpng/bitmaps/tiny_underscore.xbm diff --git a/src/bitmaps/tiny_xsuperior.xbm b/src/x49gpng/bitmaps/tiny_xsuperior.xbm similarity index 100% rename from src/bitmaps/tiny_xsuperior.xbm rename to src/x49gpng/bitmaps/tiny_xsuperior.xbm diff --git a/src/bitmaps/tiny_zero.xbm b/src/x49gpng/bitmaps/tiny_zero.xbm similarity index 100% rename from src/bitmaps/tiny_zero.xbm rename to src/x49gpng/bitmaps/tiny_zero.xbm diff --git a/src/block-qcow.c b/src/x49gpng/block-qcow.c similarity index 99% rename from src/block-qcow.c rename to src/x49gpng/block-qcow.c index 7df4634..b90c6ee 100644 --- a/src/block-qcow.c +++ b/src/x49gpng/block-qcow.c @@ -21,7 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "qemu-git/qemu-common.h" + +#include "qemu-common.h" + #include "block.h" #include "block_int.h" #include diff --git a/src/block-raw.c b/src/x49gpng/block-raw.c similarity index 99% rename from src/block-raw.c rename to src/x49gpng/block-raw.c index d2af761..5d8e318 100644 --- a/src/block-raw.c +++ b/src/x49gpng/block-raw.c @@ -24,10 +24,12 @@ #include -#include "qemu-git/qemu-common.h" +#include "qemu-common.h" + #include "block.h" #include "block_int.h" #include + #ifndef _WIN32 # ifdef X49GP diff --git a/src/block-vvfat.c b/src/x49gpng/block-vvfat.c similarity index 100% rename from src/block-vvfat.c rename to src/x49gpng/block-vvfat.c diff --git a/src/block.c b/src/x49gpng/block.c similarity index 99% rename from src/block.c rename to src/x49gpng/block.c index 65eda45..907cb22 100644 --- a/src/block.c +++ b/src/x49gpng/block.c @@ -8,7 +8,8 @@ #include #include -#include "qemu-git/qemu-common.h" +#include "qemu-common.h" + #include "block.h" #include "block_int.h" diff --git a/src/block.h b/src/x49gpng/block.h similarity index 100% rename from src/block.h rename to src/x49gpng/block.h diff --git a/src/block_int.h b/src/x49gpng/block_int.h similarity index 99% rename from src/block_int.h rename to src/x49gpng/block_int.h index 8f7d3c1..ecefcc9 100644 --- a/src/block_int.h +++ b/src/x49gpng/block_int.h @@ -24,7 +24,8 @@ #ifndef BLOCK_INT_H #define BLOCK_INT_H -#include "qemu-git/qemu-common.h" +#include "qemu-common.h" + #include "block.h" struct BlockDriver { diff --git a/src/byteorder.h b/src/x49gpng/byteorder.h similarity index 100% rename from src/byteorder.h rename to src/x49gpng/byteorder.h diff --git a/src/flash.c b/src/x49gpng/flash.c similarity index 100% rename from src/flash.c rename to src/x49gpng/flash.c diff --git a/src/gdbstub.c b/src/x49gpng/gdbstub.c similarity index 99% rename from src/gdbstub.c rename to src/x49gpng/gdbstub.c index 7849057..ab63e00 100644 --- a/src/gdbstub.c +++ b/src/x49gpng/gdbstub.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "qemu-git/qemu-common.h" + #include #include #include @@ -29,6 +29,8 @@ #include #include +#include "qemu-common.h" + #include "gdbstub.h" #define MAX_PACKET_LENGTH 4096 diff --git a/src/gdbstub.h b/src/x49gpng/gdbstub.h similarity index 96% rename from src/gdbstub.h rename to src/x49gpng/gdbstub.h index ebb7dcc..9a1d843 100644 --- a/src/gdbstub.h +++ b/src/x49gpng/gdbstub.h @@ -1,7 +1,7 @@ #ifndef GDBSTUB_H #define GDBSTUB_H -#include "qemu-git/qemu-common.h" +#include "qemu-common.h" #define DEFAULT_GDBSTUB_PORT 1234 diff --git a/src/glyphname.h b/src/x49gpng/glyphname.h similarity index 100% rename from src/glyphname.h rename to src/x49gpng/glyphname.h diff --git a/src/hex2bin.c b/src/x49gpng/hex2bin.c similarity index 100% rename from src/hex2bin.c rename to src/x49gpng/hex2bin.c diff --git a/src/le32hex2bin.c b/src/x49gpng/le32hex2bin.c similarity index 100% rename from src/le32hex2bin.c rename to src/x49gpng/le32hex2bin.c diff --git a/src/list.h b/src/x49gpng/list.h similarity index 100% rename from src/list.h rename to src/x49gpng/list.h diff --git a/src/main.c b/src/x49gpng/main.c similarity index 100% rename from src/main.c rename to src/x49gpng/main.c diff --git a/src/module.c b/src/x49gpng/module.c similarity index 100% rename from src/module.c rename to src/x49gpng/module.c diff --git a/src/options.c b/src/x49gpng/options.c similarity index 100% rename from src/options.c rename to src/x49gpng/options.c diff --git a/src/options.h b/src/x49gpng/options.h similarity index 100% rename from src/options.h rename to src/x49gpng/options.h diff --git a/src/s3c2410.c b/src/x49gpng/s3c2410.c similarity index 100% rename from src/s3c2410.c rename to src/x49gpng/s3c2410.c diff --git a/src/s3c2410.h b/src/x49gpng/s3c2410.h similarity index 100% rename from src/s3c2410.h rename to src/x49gpng/s3c2410.h diff --git a/src/s3c2410_adc.c b/src/x49gpng/s3c2410_adc.c similarity index 100% rename from src/s3c2410_adc.c rename to src/x49gpng/s3c2410_adc.c diff --git a/src/s3c2410_arm.c b/src/x49gpng/s3c2410_arm.c similarity index 99% rename from src/s3c2410_arm.c rename to src/x49gpng/s3c2410_arm.c index 4b034dc..5c136b8 100644 --- a/src/s3c2410_arm.c +++ b/src/x49gpng/s3c2410_arm.c @@ -7,12 +7,12 @@ #include #include -#include "qemu-git/target-arm/cpu.h" +#include "target-arm/cpu.h" #include "x49gp.h" #include "s3c2410.h" -#include "qemu-git/cpu-all.h" +#include "cpu-all.h" static int s3c2410_arm_load( x49gp_module_t* module, GKeyFile* key ) { diff --git a/src/s3c2410_intc.c b/src/x49gpng/s3c2410_intc.c similarity index 100% rename from src/s3c2410_intc.c rename to src/x49gpng/s3c2410_intc.c diff --git a/src/s3c2410_intc.h b/src/x49gpng/s3c2410_intc.h similarity index 100% rename from src/s3c2410_intc.h rename to src/x49gpng/s3c2410_intc.h diff --git a/src/s3c2410_io_port.c b/src/x49gpng/s3c2410_io_port.c similarity index 100% rename from src/s3c2410_io_port.c rename to src/x49gpng/s3c2410_io_port.c diff --git a/src/s3c2410_lcd.c b/src/x49gpng/s3c2410_lcd.c similarity index 100% rename from src/s3c2410_lcd.c rename to src/x49gpng/s3c2410_lcd.c diff --git a/src/s3c2410_memc.c b/src/x49gpng/s3c2410_memc.c similarity index 100% rename from src/s3c2410_memc.c rename to src/x49gpng/s3c2410_memc.c diff --git a/src/s3c2410_mmu.h b/src/x49gpng/s3c2410_mmu.h similarity index 100% rename from src/s3c2410_mmu.h rename to src/x49gpng/s3c2410_mmu.h diff --git a/src/s3c2410_nand.c b/src/x49gpng/s3c2410_nand.c similarity index 100% rename from src/s3c2410_nand.c rename to src/x49gpng/s3c2410_nand.c diff --git a/src/s3c2410_power.c b/src/x49gpng/s3c2410_power.c similarity index 100% rename from src/s3c2410_power.c rename to src/x49gpng/s3c2410_power.c diff --git a/src/s3c2410_power.h b/src/x49gpng/s3c2410_power.h similarity index 100% rename from src/s3c2410_power.h rename to src/x49gpng/s3c2410_power.h diff --git a/src/s3c2410_rtc.c b/src/x49gpng/s3c2410_rtc.c similarity index 100% rename from src/s3c2410_rtc.c rename to src/x49gpng/s3c2410_rtc.c diff --git a/src/s3c2410_sdi.c b/src/x49gpng/s3c2410_sdi.c similarity index 100% rename from src/s3c2410_sdi.c rename to src/x49gpng/s3c2410_sdi.c diff --git a/src/s3c2410_spi.c b/src/x49gpng/s3c2410_spi.c similarity index 100% rename from src/s3c2410_spi.c rename to src/x49gpng/s3c2410_spi.c diff --git a/src/s3c2410_sram.c b/src/x49gpng/s3c2410_sram.c similarity index 100% rename from src/s3c2410_sram.c rename to src/x49gpng/s3c2410_sram.c diff --git a/src/s3c2410_timer.c b/src/x49gpng/s3c2410_timer.c similarity index 100% rename from src/s3c2410_timer.c rename to src/x49gpng/s3c2410_timer.c diff --git a/src/s3c2410_timer.h b/src/x49gpng/s3c2410_timer.h similarity index 100% rename from src/s3c2410_timer.h rename to src/x49gpng/s3c2410_timer.h diff --git a/src/s3c2410_uart.c b/src/x49gpng/s3c2410_uart.c similarity index 100% rename from src/s3c2410_uart.c rename to src/x49gpng/s3c2410_uart.c diff --git a/src/s3c2410_usbdev.c b/src/x49gpng/s3c2410_usbdev.c similarity index 100% rename from src/s3c2410_usbdev.c rename to src/x49gpng/s3c2410_usbdev.c diff --git a/src/s3c2410_watchdog.c b/src/x49gpng/s3c2410_watchdog.c similarity index 100% rename from src/s3c2410_watchdog.c rename to src/x49gpng/s3c2410_watchdog.c diff --git a/src/saturn.h b/src/x49gpng/saturn.h similarity index 100% rename from src/saturn.h rename to src/x49gpng/saturn.h diff --git a/src/sram.c b/src/x49gpng/sram.c similarity index 100% rename from src/sram.c rename to src/x49gpng/sram.c diff --git a/src/symbol.c b/src/x49gpng/symbol.c similarity index 100% rename from src/symbol.c rename to src/x49gpng/symbol.c diff --git a/src/symbol.h b/src/x49gpng/symbol.h similarity index 100% rename from src/symbol.h rename to src/x49gpng/symbol.h diff --git a/src/timer.c b/src/x49gpng/timer.c similarity index 100% rename from src/timer.c rename to src/x49gpng/timer.c diff --git a/src/tiny_font.c b/src/x49gpng/tiny_font.c similarity index 100% rename from src/tiny_font.c rename to src/x49gpng/tiny_font.c diff --git a/src/ui.c b/src/x49gpng/ui.c similarity index 100% rename from src/ui.c rename to src/x49gpng/ui.c diff --git a/src/x49gp.h b/src/x49gpng/x49gp.h similarity index 99% rename from src/x49gp.h rename to src/x49gpng/x49gp.h index 814d329..24758c5 100644 --- a/src/x49gp.h +++ b/src/x49gpng/x49gp.h @@ -12,7 +12,7 @@ #include -#include "qemu-git/target-arm/cpu.h" +#include "target-arm/cpu.h" #include "x49gp_types.h" #include "x49gp_timer.h" diff --git a/src/x49gp_timer.h b/src/x49gpng/x49gp_timer.h similarity index 100% rename from src/x49gp_timer.h rename to src/x49gpng/x49gp_timer.h diff --git a/src/x49gp_types.h b/src/x49gpng/x49gp_types.h similarity index 100% rename from src/x49gp_types.h rename to src/x49gpng/x49gp_types.h diff --git a/src/x49gp_ui.h b/src/x49gpng/x49gp_ui.h similarity index 100% rename from src/x49gp_ui.h rename to src/x49gpng/x49gp_ui.h