diff --git a/src/Makefile b/src/Makefile index f41091e..7b8a892 100644 --- a/src/Makefile +++ b/src/Makefile @@ -81,14 +81,30 @@ endif export AS = vasmm68k_mot export ASFLAGS = $(VASM_CPU) -quiet -Fvobj -nowarn=62 -DMODEL=$(MODEL_NUMBER) export CC = vc -DEFINES = -DCPU=$(CPU_NUMBER) -DMODEL=$(MODEL_NUMBER)# -D__NOINLINE__ # -DKBD_POLLED +DEFINES = -DCPU=$(CPU_NUMBER) -DMODEL=$(MODEL_NUMBER) # -D__NOINLINE__ # -DKBD_POLLED -# Logging level, see log_level.h -DEFAULT_LOG_LEVEL= +# Maximum working logging level to compile +#define LOG_FATAL 0 /* Log a critical or fatal event */ +#define LOG_ERROR 1 /* Log an error */ +#define LOG_INFO 2 /* Log miscellaneous information */ +#define LOG_DEBUG 3 /* Log a debugging message */ +#define LOG_TRACE 4 /* Log tracing information (like entry into a subroutine) */ +#define LOG_VERBOSE 5 /* Log a truly verbose message... the sort you almost never want to bother with */ +DEFAULT_LOG_LEVEL=0 +#define LOG_CHANNEL_UART0 -1 +#define LOG_CHANNEL_CHANNEL_A 0 +#define LOG_CHANNEL_CHANNEL_B 1 +#define LOG_CHANNEL_CHANNEL_A_LOW_LEVEL 10 +LOG_CHANNEL=0 ifeq ("$(DEFAULT_LOG_LEVEL)","") else DEFINES := $(DEFINES) -DDEFAULT_LOG_LEVEL=$(DEFAULT_LOG_LEVEL) endif +ifeq ("$(LOG_CHANNEL)","") +else + DEFINES := $(DEFINES) -DLOG_CHANNEL=$(LOG_CHANNEL) +endif + export DEFINES:=$(DEFINES) diff --git a/src/dev/txt_screen.c b/src/dev/txt_screen.c index 49bcccf..1279f29 100644 --- a/src/dev/txt_screen.c +++ b/src/dev/txt_screen.c @@ -685,12 +685,14 @@ void txt_delete(short screen, short count) { t_rect old_region, region; short left; - TRACE2("txt_delete(%d,%d)", screen, count); + TRACE2("txt_delete(%d,%d)", screen, (int)count); if (count > 0) { txt_get_xy(screen, &cursor); txt_get_region(screen, &old_region); +TRACE4("Got region %d,%d,%d,%d", (int)old_region.origin.x, (int)old_region.origin.y, (int)old_region.size.width, (int)old_region.size.height); + if (count > cursor.x) { count = cursor.x; } @@ -699,6 +701,8 @@ void txt_delete(short screen, short count) { region.origin.y = old_region.origin.y + cursor.y; region.size.width = old_region.size.width - cursor.x; region.size.height = 1; + + TRACE4("Setting region %d,%d,%d,%d", (int)region.origin.x, (int)region.origin.y, (int)region.size.width, (int)region.size.height); txt_set_region(screen, ®ion); txt_scroll(screen, count, 0); txt_set_region(screen, &old_region); diff --git a/src/include/features.h b/src/include/features.h index 6385e1a..fa35910 100644 --- a/src/include/features.h +++ b/src/include/features.h @@ -25,7 +25,7 @@ #define HAS_OPM 1 #define HAS_SNES_GAMEPAD 1 #define HAS_OPL3 1 -#elif MODEL == MODEL_FOENIX_A2560U +#elif MODEL == MODEL_FOENIX_A2560U || MODEL == MODEL_FOENIX_A2560U_PLUS #define HAS_OPL3 1 #endif