1
0
Fork 0
forked from Miroirs/x49gp

Rename project to x50ng

This commit is contained in:
Gwenhael Le Moine 2024-11-20 13:57:49 +01:00
parent 6504fbe095
commit 78902ca527
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
51 changed files with 46 additions and 46 deletions

6
.gitignore vendored
View file

@ -8,10 +8,10 @@
/src/qemu-git/libhw64
/src/qemu-git/config-host.*
/src/qemu-git/config-all-devices.mak
/dist/x49gpng
/dist/x50ng
/dist/sdcard
/dist/x49gpng.desktop
/dist/x49gpng.man
/dist/x50ng.desktop
/dist/x50ng.man
/dist/firmware/*.zip
/dist/firmware/Readme.txt
/dist/firmware/boot-*.bin

View file

@ -1,5 +1,5 @@
TARGET = x49gpng
TARGET_ALLCAPS = X49GPNG
TARGET = x50ng
TARGET_ALLCAPS = X50NG
VERSION_MAJOR = 1
VERSION_MINOR = 4
@ -88,8 +88,8 @@ X49GP_DEBUG = \
-DDEBUG_X49GP_MAIN \
-DDEBUG_X49GP_UI
X49GP_INCLUDES = -I./src/x49gpng/ \
-I./src/x49gpng/bitmaps/ \
X49GP_INCLUDES = -I./src/x50ng/ \
-I./src/x50ng/bitmaps/ \
-I./src/qemu-git/ \
$(QEMU_INCLUDES)
@ -116,39 +116,39 @@ endif
X49GP_LDFLAGS = $(DEBUG_CFLAGS) $(LDFLAGS)
X49GP_LDLIBS = $(QEMU_OBJS) $(GDB_LIBS) $(COCOA_LIBS) $(GTK_LDLIBS) $(LUALIBS)
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/gdbstub.c \
./src/x49gpng/block.c \
./src/x49gpng/options.c
SRCS = ./src/x50ng/main.c \
./src/x50ng/module.c \
./src/x50ng/flash.c \
./src/x50ng/sram.c \
./src/x50ng/s3c2410.c \
./src/x50ng/s3c2410_sram.c \
./src/x50ng/s3c2410_memc.c \
./src/x50ng/s3c2410_intc.c \
./src/x50ng/s3c2410_power.c \
./src/x50ng/s3c2410_lcd.c \
./src/x50ng/s3c2410_nand.c \
./src/x50ng/s3c2410_uart.c \
./src/x50ng/s3c2410_timer.c \
./src/x50ng/s3c2410_usbdev.c \
./src/x50ng/s3c2410_watchdog.c \
./src/x50ng/s3c2410_io_port.c \
./src/x50ng/s3c2410_rtc.c \
./src/x50ng/s3c2410_adc.c \
./src/x50ng/s3c2410_spi.c \
./src/x50ng/s3c2410_sdi.c \
./src/x50ng/s3c2410_arm.c \
./src/x50ng/ui.c \
./src/x50ng/timer.c \
./src/x50ng/gdbstub.c \
./src/x50ng/block.c \
./src/x50ng/options.c
OBJS = $(SRCS:.c=.o)
# TEMPO hack
VVFATOBJS = ./src/x49gpng/block-vvfat.o \
./src/x49gpng/block-qcow.o \
./src/x49gpng/block-raw.o \
VVFATOBJS = ./src/x50ng/block-vvfat.o \
./src/x50ng/block-qcow.o \
./src/x50ng/block-raw.o \
$(QEMU_DIR)/cutils.o
all: do-it-all
@ -167,7 +167,7 @@ dist/$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU_OBJS)
%.o: %.c
$(CC) $(X49GP_CFLAGS) -o $@ -c $<
./src/x49gpng/block-vvfat.o: ./src/x49gpng/block-vvfat.c
./src/x50ng/block-vvfat.o: ./src/x50ng/block-vvfat.c
$(CC) $(X49GP_CFLAGS) -fno-aggressive-loop-optimizations -o $@ -c $<
# Compilation of qemu-git
@ -197,7 +197,7 @@ depend: depend-libs
# Cleaning
clean:
rm -f ./src/x49gpng/*.o core *~ .depend
rm -f ./src/x50ng/*.o core *~ .depend
distclean: clean clean-qemu
rm -f dist/$(TARGET) dist/$(TARGET).desktop dist/$(TARGET).man
@ -207,7 +207,7 @@ mrproper: distclean
# auto-format code
pretty-code:
clang-format -i ./src/x49gpng/*.c $(shell ls ./src/x49gpng/*.h | grep -v s3c2410.h) ## s3c2410.h triggers an error
clang-format -i ./src/x50ng/*.c $(shell ls ./src/x50ng/*.h | grep -v s3c2410.h) ## s3c2410.h triggers an error
# Populate dist/firmware/ from hpcalc.org
pull-firmware:

View file

View file

@ -93,7 +93,7 @@ static inline bool config_read( const char* filename )
static void print_config( void )
{
fprintf( stdout, "--------------------------------------------------------------------------------\n" );
fprintf( stdout, "-- Configuration file for x49gpng\n" );
fprintf( stdout, "-- Configuration file for x50ng\n" );
fprintf( stdout, "-- This is a comment\n" );
fprintf( stdout, "name = \"%s\" -- this customize the title of the window\n", opt.name );
@ -108,7 +108,7 @@ static void print_config( void )
fprintf( stdout, "verbose = %s\n", opt.verbose ? "true" : "false" );
fprintf( stdout, "--- End of x49gpng configuration -----------------------------------------------\n" );
fprintf( stdout, "--- End of x50ng configuration -----------------------------------------------\n" );
}
void config_init( char* progname, int argc, char* argv[] )

View file

@ -15,7 +15,7 @@
# define PATCHLEVEL 0
#endif
typedef enum { MODEL_49GP = 0, MODEL_50G } x49gpng_model_t;
typedef enum { MODEL_49GP = 0, MODEL_50G } x50ng_model_t;
struct options {
char* state_filename;
@ -24,7 +24,7 @@ struct options {
char* firmware;
x49gp_reinit_t reinit;
x49gpng_model_t model;
x50ng_model_t model;
bool newrpl;
char* name;

View file

@ -693,15 +693,15 @@ char* css_global = "window {"
/* functions */
/*************/
static inline void x49gpng_set_key_state( x49gp_t* x49gp, const x49gp_ui_key_t* key, bool state )
static inline void x50ng_set_key_state( x49gp_t* x49gp, const x49gp_ui_key_t* key, bool state )
{
if ( key->rowbit )
s3c2410_io_port_g_update( x49gp, key->column, key->row, key->columnbit, key->rowbit, state );
else
s3c2410_io_port_f_set_bit( x49gp, key->eint, state );
}
#define X49GPNG_PRESS_KEY( x49gp, key ) x49gpng_set_key_state( x49gp, key, true )
#define X49GPNG_RELEASE_KEY( x49gp, key ) x49gpng_set_key_state( x49gp, key, false )
#define X49GPNG_PRESS_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, true )
#define X49GPNG_RELEASE_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, false )
static void ui_release_button( x49gp_ui_button_t* button )
{