From d2bf79bb7c772324844103f104e028a9aabd801c Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Wed, 21 Apr 2010 21:59:03 +0000 Subject: [PATCH] Removing all references to the KEGS name except in the copyright notices --- doc/web/src/site/apt/developing.apt | 2 +- src/Info.plist | 4 +- src/Makefile | 20 ++--- src/arch/os2/Makefile | 2 +- src/clock.c | 4 +- src/config.c | 114 ++++++++++++++-------------- src/defc.h | 2 +- src/gsport32.aps | Bin 0 -> 42280 bytes src/{kegs32.ico => gsport32.ico} | Bin src/{kegs32.rc => gsport32.rc} | 20 ++--- src/{kegsfont.h => gsportfont.h} | 0 src/iwm.c | 4 +- src/kegs32.aps | Bin 59964 -> 0 bytes src/macdriver.c | 18 ++--- src/moremem.c | 8 +- src/os2driver.c | 6 +- src/protos.h | 18 ++--- src/protos_macdriver.h | 2 +- src/protos_xdriver.h | 2 +- src/resource | 6 +- src/resource.h | 6 +- src/scc_socket_driver.c | 2 +- src/sim65816.c | 30 ++++---- src/smartport.c | 2 +- src/sound.c | 4 +- src/sound_driver.c | 2 +- src/superhires.h | 8 +- src/vars_kegs32 | 8 +- src/vars_win32 | 6 +- src/vars_x86linux | 2 +- src/vars_x86solaris | 2 +- src/video.c | 8 +- src/win32.rc | 16 ++-- src/windriver.c | 10 +-- src/winresource.h | 4 +- src/xdriver.c | 6 +- 36 files changed, 172 insertions(+), 176 deletions(-) create mode 100644 src/gsport32.aps rename src/{kegs32.ico => gsport32.ico} (100%) rename src/{kegs32.rc => gsport32.rc} (90%) rename src/{kegsfont.h => gsportfont.h} (100%) delete mode 100644 src/kegs32.aps diff --git a/doc/web/src/site/apt/developing.apt b/doc/web/src/site/apt/developing.apt index 4e44699..34a0b3f 100644 --- a/doc/web/src/site/apt/developing.apt +++ b/doc/web/src/site/apt/developing.apt @@ -129,6 +129,6 @@ by runnning the command: <<>> If you are porting to an X-windows and Unix-based machine, it should be easy. Start with <<>> if you are a little-endian machine, or -<<>> if you are big endian. Don't define <<<-DKEGS_LITTLE_ENDIAN>>> +<<>> if you are big endian. Don't define <<<-DGSPORT_LITTLE_ENDIAN>>> unless your processor is little-endian (x86, Alpha). Mac, Sun, MIPS, HP, Motorola, and IBM are big-endian. \ No newline at end of file diff --git a/src/Info.plist b/src/Info.plist index a6848d1..e5a3602 100644 --- a/src/Info.plist +++ b/src/Info.plist @@ -26,7 +26,7 @@ CFBundleTypeExtensions - kegs + gsport CFBundleTypeIconFile 525.icns @@ -34,7 +34,7 @@ GSport Configuration File CFBundleTypeOSTypes - kegs + gsport CFBundleTypeRole None diff --git a/src/Makefile b/src/Makefile index 2a48b4a..56eddee 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,9 @@ PERL = perl all: $(TARGET) clean: - rm $(OBJECTS) + - rm $(OBJECTS) + - rm 8inst_c.h + - rm 16inst_c.h specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s @@ -48,14 +50,8 @@ gsportx: $(OBJECTS) compile_time.o mv gsportx .. cp -f ../config.template ../config.txt -# Cygwin for X builds: -gsport.exe: $(OBJECTS) compile_time.o - $(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lXext -lX11 -lm -lshell32 - mv gsport.exe .. - cp -f ../config.template ../config.txt - # Mingw32 (native windows) builds: -gsportwin.exe: $(OBJECTS) compile_time.o +gsport.exe: $(OBJECTS) compile_time.o $(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32 mv $(NAME)$(SUFFIX) .. cp -f ../config.template ../config.txt @@ -104,8 +100,8 @@ partls: partls.c to_pro: prodos.h prodos_protos.h to_pro.c cc $(CCOPTS) $(XOPTS) $(OPTS) -o to_pro to_pro.c -kegs32.o: win32.rc winresource.h - windres win32.rc -o kegs32.o +gsport32.o: win32.rc winresource.h + windres win32.rc -o gsport32.o compile_time.o: $(OBJECTS) @@ -131,12 +127,12 @@ sim65816.o: sim65816.c defc.h defcomm.h iwm.h protos.h smartport.o: smartport.c defc.h defcomm.h iwm.h protos.h sound.o: sound.c defc.h defcomm.h iwm.h protos.h sound.h sound_driver.o: sound_driver.c defc.h defcomm.h iwm.h protos.h sound.h -video.o: video.c defc.h defcomm.h iwm.h protos.h superhires.h kegsfont.h +video.o: video.c defc.h defcomm.h iwm.h protos.h superhires.h gsportfont.h tfe.o: tfe/tfe.c tfe/tfe.h tfe/tfe_protos.h tfearch.o:arch/win32/tfearch.c tfe/tfearch.h tfe/tfe_protos.h tfesupp.o: tfe/tfesupp.c tfe/tfesupp.h tfe/tfe_protos.h uilib.o: tfe/uilib.c tfe/uilib.h tfe/tfe_protos.h macdriver.o: macdriver.c defc.h defcomm.h iwm.h protos.h protos_macdriver.h macsnd_driver.o: macsnd_driver.c defc.h defcomm.h iwm.h protos.h sound.h -windriver.o: windriver.c defc.h defcomm.h iwm.h protos.h protos_windriver.h winresource.h kegs32.o +windriver.o: windriver.c defc.h defcomm.h iwm.h protos.h protos_windriver.h winresource.h gsport32.o win32snd_driver.o: win32snd_driver.c defc.h defcomm.h iwm.h protos.h sound.h diff --git a/src/arch/os2/Makefile b/src/arch/os2/Makefile index f51c794..faaa2fd 100644 --- a/src/arch/os2/Makefile +++ b/src/arch/os2/Makefile @@ -47,6 +47,6 @@ sim65816.obj: ../../sim65816.c ../../scc.c ../../defc.h ../../defcomm.h ../../iw smartport.obj: ../../smartport.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h sound.obj: ../../sound.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h sound_driver.obj: ../../sound_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../sound.h -video.obj: ../../video.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../superhires.h ../../kegsfont.h +video.obj: ../../video.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../superhires.h ../../gsportfont.h os2driver.obj: ../../os2driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h  \ No newline at end of file diff --git a/src/clock.c b/src/clock.c index 4ef383a..ba6f4d7 100644 --- a/src/clock.c +++ b/src/clock.c @@ -33,7 +33,7 @@ const char rcsid_clock_c[] = "@(#)$KmKId: clock.c,v 1.31 2004-10-19 17:32:07-04 extern int Verbose; extern int g_vbl_count; extern int g_rom_version; -extern int g_config_kegs_update_needed; +extern int g_config_gsport_update_needed; #define CLK_IDLE 1 #define CLK_TIME 2 @@ -327,7 +327,7 @@ do_clock_data() clk_printf("Writing BRAM loc %02x with %02x\n", g_clk_reg1, g_c033_data); g_bram_ptr[g_clk_reg1] = g_c033_data; - g_config_kegs_update_needed = 1; + g_config_gsport_update_needed = 1; } } g_clk_mode = CLK_IDLE; diff --git a/src/config.c b/src/config.c index cc8c2ef..77456b1 100644 --- a/src/config.c +++ b/src/config.c @@ -92,16 +92,16 @@ extern int g_a2_new_all_stat[]; extern int g_new_a2_stat_cur_line; extern int g_key_down; -extern const char g_kegs_version_str[]; +extern const char g_gsport_version_str[]; int g_config_control_panel = 0; -char g_config_kegs_name[1024]; +char g_config_gsport_name[1024]; char g_cfg_cwd_str[CFG_PATH_MAX] = { 0 }; -int g_config_kegs_auto_update = 1; -int g_config_kegs_update_needed = 0; +int g_config_gsport_auto_update = 1; +int g_config_gsport_update_needed = 0; -const char *g_config_kegs_name_list[] = { - "config.txt", "config.kegs", "kegs_conf", ".config.kegs", 0 +const char *g_config_gsport_name_list[] = { + "config.txt", "config.gsport", "gsport_conf", ".config.gsport", 0 }; int g_highest_smartport_unit = -1; @@ -111,7 +111,7 @@ int g_user_page2_shadow = 1; byte g_save_text_screen_bytes[0x800]; int g_save_cur_a2_stat = 0; char g_cfg_printf_buf[CFG_PRINTF_BUFSIZE]; -char g_config_kegs_buf[CONF_BUF_LEN]; +char g_config_gsport_buf[CONF_BUF_LEN]; word32 g_cfg_vbl_count = 0; @@ -271,7 +271,7 @@ Cfg_menu g_cfg_main_menu[] = { { "Virtual Printer Configuration", g_cfg_printer_menu, 0, 0, CFGTYPE_MENU }, { "Force X-windows display depth", KNMP(g_force_depth), CFGTYPE_INT }, { "Auto-update configuration file,0,Manual,1,Immediately", - KNMP(g_config_kegs_auto_update), CFGTYPE_INT }, + KNMP(g_config_gsport_auto_update), CFGTYPE_INT }, { "Speed,0,Unlimited,1,1.0MHz,2,2.8MHz,3,8.0MHz (Zip)", KNMP(g_limit_speed), CFGTYPE_INT }, { "Expansion Mem Size,0,0MB,0x100000,1MB,0x200000,2MB,0x300000,3MB," @@ -289,7 +289,7 @@ Cfg_menu g_cfg_main_menu[] = { KNMP(g_user_page2_shadow), CFGTYPE_INT }, { "Dump text screen to file", (void *)cfg_text_screen_dump, 0, 0, CFGTYPE_FUNC}, { "", 0, 0, 0, 0 }, -{ "Save changes to configuration file", (void *)config_write_config_kegs_file, 0, 0, +{ "Save changes to configuration file", (void *)config_write_config_gsport_file, 0, 0, CFGTYPE_FUNC }, { "", 0, 0, 0, 0 }, { "Exit Config (or press F4)", (void *)cfg_exit, 0, 0, CFGTYPE_FUNC }, @@ -316,23 +316,23 @@ Cfg_listhdr g_cfg_partitionlist = { 0 }; int g_cfg_file_pathfield = 0; -const char *g_kegs_rom_names[] = { "ROM", "ROM", "ROM.01", "ROM.03", 0 }; +const char *g_gsport_rom_names[] = { "ROM", "ROM", "ROM.01", "ROM.03", 0 }; /* First entry is special--it will be overwritten by g_cfg_rom_path */ -const char *g_kegs_c1rom_names[] = { "parallel.rom" }; -const char *g_kegs_c2rom_names[] = { 0 }; -const char *g_kegs_c3rom_names[] = { 0 }; -const char *g_kegs_c4rom_names[] = { 0 }; -const char *g_kegs_c5rom_names[] = { 0 }; -const char *g_kegs_c6rom_names[] = { "c600.rom", "controller.rom", "disk.rom", +const char *g_gsport_c1rom_names[] = { "parallel.rom" }; +const char *g_gsport_c2rom_names[] = { 0 }; +const char *g_gsport_c3rom_names[] = { 0 }; +const char *g_gsport_c4rom_names[] = { 0 }; +const char *g_gsport_c5rom_names[] = { 0 }; +const char *g_gsport_c6rom_names[] = { "c600.rom", "controller.rom", "disk.rom", "DISK.ROM", "diskII.prom", 0 }; -const char *g_kegs_c7rom_names[] = { 0 }; +const char *g_gsport_c7rom_names[] = { 0 }; -const char **g_kegs_rom_card_list[8] = { - 0, g_kegs_c1rom_names, - g_kegs_c2rom_names, g_kegs_c3rom_names, - g_kegs_c4rom_names, g_kegs_c5rom_names, - g_kegs_c6rom_names, g_kegs_c7rom_names }; +const char **g_gsport_rom_card_list[8] = { + 0, g_gsport_c1rom_names, + g_gsport_c2rom_names, g_gsport_c3rom_names, + g_gsport_c4rom_names, g_gsport_c5rom_names, + g_gsport_c6rom_names, g_gsport_c7rom_names }; byte g_rom_c600_rom01_diffs[256] = { 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0xe2, 0x00, @@ -415,7 +415,7 @@ config_init_menus(Cfg_menu *menuptr) // We need to malloc this string since all // string values must be dynamically alloced defptr->strval = str; // this can have a copy - *str_ptr = kegs_malloc_str(str); + *str_ptr = gsport_malloc_str(str); menuptr->defptr = &(defptr->strval); break; case CFGTYPE_FILE: @@ -424,7 +424,7 @@ config_init_menus(Cfg_menu *menuptr) // We need to malloc this string since all // string values must be dynamically alloced defptr->strval = str; // this can have a copy - *str_ptr = kegs_malloc_str(str); + *str_ptr = gsport_malloc_str(str); menuptr->defptr = &(defptr->strval); break; default: @@ -449,12 +449,12 @@ config_init() config_init_menus(g_cfg_main_menu); // Find the configuration file - g_config_kegs_name[0] = 0; + g_config_gsport_name[0] = 0; can_create = 1; - setup_kegs_file(&g_config_kegs_name[0], sizeof(g_config_kegs_name), 0, - can_create, &g_config_kegs_name_list[0]); + setup_gsport_file(&g_config_gsport_name[0], sizeof(g_config_gsport_name), 0, + can_create, &g_config_gsport_name_list[0]); - config_parse_config_kegs_file(); + config_parse_config_gsport_file(); } void @@ -486,7 +486,7 @@ cfg_text_screen_dump() int pos; int i, j; - filename = "kegs.screen.dump"; + filename = "gsport.screen.dump"; printf("Writing text screen to the file %s\n", filename); ofile = fopen(filename, "w"); if(ofile == 0) { @@ -561,8 +561,8 @@ void config_vbl_update(int doit_3_persec) { if(doit_3_persec) { - if(g_config_kegs_auto_update && g_config_kegs_update_needed) { - config_write_config_kegs_file(); + if(g_config_gsport_auto_update && g_config_gsport_update_needed) { + config_write_config_gsport_file(); } } return; @@ -648,14 +648,14 @@ config_parse_option(char *buf, int pos, int len, int line) if(strptr && *strptr) { free(*strptr); } - *strptr = kegs_malloc_str(&buf[pos]); + *strptr = gsport_malloc_str(&buf[pos]); break; case CFGTYPE_FILE: strptr = (char **)menuptr->ptr; if(strptr && *strptr) { free(*strptr); } - *strptr = kegs_malloc_str(&buf[pos]); + *strptr = gsport_malloc_str(&buf[pos]); break; default: printf("Config file variable %s is unknown type: %d\n", @@ -713,11 +713,11 @@ config_load_roms() g_rom_version = -1; - /* set first entry of g_kegs_rom_names[] to g_cfg_rom_path so that */ + /* set first entry of g_gsport_rom_names[] to g_cfg_rom_path so that */ /* it becomes the first place searched. */ - g_kegs_rom_names[0] = g_cfg_rom_path; - setup_kegs_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, -1, 0, - &g_kegs_rom_names[0]); + g_gsport_rom_names[0] = g_cfg_rom_path; + setup_gsport_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, -1, 0, + &g_gsport_rom_names[0]); if(g_cfg_tmp_path[0] == 0) { // Just get out, let config interface select ROM @@ -783,7 +783,7 @@ config_load_roms() } for(i = 1; i < 8; i++) { - names_ptr = g_kegs_rom_card_list[i]; + names_ptr = g_gsport_rom_card_list[i]; if(names_ptr == 0) { continue; } @@ -791,7 +791,7 @@ config_load_roms() continue; } - setup_kegs_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, 1, 0, + setup_gsport_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, 1, 0, names_ptr); if(g_cfg_tmp_path[0] != 0) { @@ -903,7 +903,7 @@ config_load_roms() } void -config_parse_config_kegs_file() +config_parse_config_gsport_file() { FILE *fconf; char *buf; @@ -927,7 +927,7 @@ config_parse_config_kegs_file() g_highest_smartport_unit = -1; - cfg_get_base_path(&g_cfg_cwd_str[0], g_config_kegs_name, 0); + cfg_get_base_path(&g_cfg_cwd_str[0], g_config_gsport_name, 0); if(g_cfg_cwd_str[0] != 0) { ret = chdir(&g_cfg_cwd_str[0]); if(ret != 0) { @@ -938,16 +938,16 @@ config_parse_config_kegs_file() /* In any case, copy the directory path to g_cfg_cwd_str */ (void)getcwd(&g_cfg_cwd_str[0], CFG_PATH_MAX); - fconf = fopen(g_config_kegs_name, "r"); + fconf = fopen(g_config_gsport_name, "r"); if(fconf == 0) { fatal_printf("cannot open configuration file at %s! Stopping!\n", - g_config_kegs_name); + g_config_gsport_name); my_exit(3); } line = 0; while(1) { - buf = &g_config_kegs_buf[0]; + buf = &g_config_gsport_buf[0]; ptr = fgets(buf, CONF_BUF_LEN, fconf); if(ptr == 0) { iwm_printf("Done reading disk_conf\n"); @@ -1096,7 +1096,7 @@ cfg_get_dsk_from_slot_drive(int slot, int drive) } void -config_generate_config_kegs_name(char *outstr, int maxlen, Disk *dsk, +config_generate_config_gsport_name(char *outstr, int maxlen, Disk *dsk, int with_extras) { char *str; @@ -1124,7 +1124,7 @@ config_generate_config_kegs_name(char *outstr, int maxlen, Disk *dsk, } void -config_write_config_kegs_file() +config_write_config_gsport_file() { FILE *fconf; Disk *dsk; @@ -1136,16 +1136,16 @@ config_write_config_kegs_file() int slot, drive; int i; - printf("Writing configuration file to %s\n", g_config_kegs_name); + printf("Writing configuration file to %s\n", g_config_gsport_name); - fconf = fopen(g_config_kegs_name, "w+"); + fconf = fopen(g_config_gsport_name, "w+"); if(fconf == 0) { halt_printf("cannot open %s! Stopping!\n"); return; } fprintf(fconf, "# GSport configuration file version %s\n", - g_kegs_version_str); + g_gsport_version_str); for(i = 0; i < MAX_C7_DISKS + 4; i++) { slot = 7; @@ -1168,7 +1168,7 @@ config_write_config_kegs_file() fprintf(fconf, "\n"); continue; } - config_generate_config_kegs_name(&g_cfg_tmp_path[0], + config_generate_config_gsport_name(&g_cfg_tmp_path[0], CFG_PATH_MAX, dsk, 1); fprintf(fconf, "%s\n", &g_cfg_tmp_path[0]); } @@ -1213,7 +1213,7 @@ config_write_config_kegs_file() fclose(fconf); - g_config_kegs_update_needed = 0; + g_config_gsport_update_needed = 0; } void @@ -1241,7 +1241,7 @@ insert_disk(int slot, int drive, const char *name, int ejected, int force_size, int tmp; int i; - g_config_kegs_update_needed = 1; + g_config_gsport_update_needed = 1; if((slot < 5) || (slot > 7)) { fatal_printf("Invalid slot for inserting disk: %d\n", slot); @@ -1580,7 +1580,7 @@ eject_disk(Disk *dsk) return; } - g_config_kegs_update_needed = 1; + g_config_gsport_update_needed = 1; motor_on = iwm.motor_on; if(g_c031_disk35 & 0x40) { @@ -2010,7 +2010,7 @@ cfg_get_disk_name(char *outstr, int maxlen, int type_ext, int with_extras) return; } - config_generate_config_kegs_name(outstr, maxlen, dsk, with_extras); + config_generate_config_gsport_name(outstr, maxlen, dsk, with_extras); } void @@ -2236,7 +2236,7 @@ cfg_parse_menu(Cfg_menu *menuptr, int menu_pos, int highlight_pos, int change) str_ptr = (char **)menuptr->ptr; *str_ptr = curstr; } - g_config_kegs_update_needed = 1; + g_config_gsport_update_needed = 1; } #if 0 @@ -2829,7 +2829,7 @@ cfg_file_draw() cfg_htab_vtab(2, 1); cfg_printf("Configuration file path: %-56s", - cfg_shorten_filename(&g_config_kegs_name[0], 56)); + cfg_shorten_filename(&g_config_gsport_name[0], 56)); cfg_htab_vtab(2, 2); cfg_printf("Current directory: %-50s", @@ -2958,7 +2958,7 @@ cfg_file_update_ptr(char *str) printf("Updated ROM file\n"); load_roms_init_memory(); } - g_config_kegs_update_needed = 1; + g_config_gsport_update_needed = 1; } void diff --git a/src/defc.h b/src/defc.h index b9b0f44..0dbb871 100644 --- a/src/defc.h +++ b/src/defc.h @@ -52,7 +52,7 @@ void U_STACK_TRACE(); #define DCYCS_IN_16MS ((double)((int)DCYCS_IN_16MS_RAW)) #define DRECIP_DCYCS_IN_16MS (1.0 / (DCYCS_IN_16MS)) -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN # define BIGEND(a) ((((a) >> 24) & 0xff) + \ (((a) >> 8) & 0xff00) + \ (((a) << 8) & 0xff0000) + \ diff --git a/src/gsport32.aps b/src/gsport32.aps new file mode 100644 index 0000000000000000000000000000000000000000..a4529cd9c3789337d07e1fd3574a098abaa76c72 GIT binary patch literal 42280 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 literal 0 HcmV?d00001 diff --git a/src/kegs32.ico b/src/gsport32.ico similarity index 100% rename from src/kegs32.ico rename to src/gsport32.ico diff --git a/src/kegs32.rc b/src/gsport32.rc similarity index 90% rename from src/kegs32.rc rename to src/gsport32.rc index 3920f48..efad538 100644 --- a/src/kegs32.rc +++ b/src/gsport32.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Menu // -IDC_KEGS32 MENU +IDC_GSPORT32 MENU BEGIN POPUP "&Emulator" BEGIN @@ -53,7 +53,7 @@ END // Bitmap // -IDC_KEGS32 BITMAP "wintoolbar.bmp" +IDC_GSPORT32 BITMAP "wintoolbar.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -74,8 +74,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDC_KEGS32 ICON "kegs32.ico" -KEGS32_ICON ICON "kegs32.ico" +IDC_GSPORT32 ICON "gsport32.ico" +GSPORT32_ICON ICON "gsport32.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -88,8 +88,8 @@ CAPTION "About" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,78,61,50,14 - LTEXT "KEGS32: GS Emulator.\nBased on KEGS by Kent Dickey\nWindows Port by Chea Chee Keong\n\nThis software is free for non-commercial use.",IDC_STATIC,38,7,162,45,NOT WS_GROUP - ICON "KEGS32_ICON",IDC_STATIC,7,7,20,20 + LTEXT "GSport: GS Emulator.\nBased on KEGS by Kent Dickey\nWindows Port by Chea Chee Keong\n\nThis software is free for non-commercial use.",IDC_STATIC,38,7,162,45,NOT WS_GROUP + ICON "GSPORT32_ICON",IDC_STATIC,7,7,20,20 END IDD_DLG_DISKCONF DIALOGEX 0, 0, 268, 182 @@ -135,20 +135,20 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,183,107,50,15 GROUPBOX "Speed Control",IDC_STATIC,7,7,226,96,WS_GROUP LTEXT "Adjust the speed of your emulator by selecting the appropriate speed control",IDC_STATIC,46,19,181,19,NOT WS_GROUP - ICON IDC_KEGS32,IDC_STATIC,14,19,21,20 + ICON IDC_GSPORT32,IDC_STATIC,14,19,21,20 END -IDD_KEGS32_KEY DIALOGEX 0, 0, 186, 172 +IDD_GSPORT32_KEY DIALOGEX 0, 0, 186, 172 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Help About Key Commands" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,65,151,50,14 - LTEXT "KEGS32 Key Commands",IDC_STATIC,7,7,82,10 + LTEXT "GSport Key Commands",IDC_STATIC,7,7,82,10 LTEXT "Alt/F1\t\tOpen-Apple\nF2\t\tClose-Apple\nF7\t\tToggle Fast Disk Emulation\nF8\t\tToggle Mouse Pointer\n\t\tDisplay\n",IDC_STATIC,21,25,151,42 LTEXT "F11\t\tToggle Fullscreen Display\nF12\t\tReset\nCtrl-Alt-Break\tReboot Emulator\nCtrl-Alt-Esc\tControl-Panel\nCtrl-Break\tReset Emulator",IDC_STATIC,21,66,141,50 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | WS_DISABLED | WS_BORDER,7,17,172,1 - LTEXT "For more information, please consult the readme.kegs file",IDC_STATIC,21,124,144,19 + LTEXT "For more information, please consult the readme.gsport file",IDC_STATIC,21,124,144,19 END diff --git a/src/kegsfont.h b/src/gsportfont.h similarity index 100% rename from src/kegsfont.h rename to src/gsportfont.h diff --git a/src/iwm.c b/src/iwm.c index 0bce1a7..ae7ab3c 100644 --- a/src/iwm.c +++ b/src/iwm.c @@ -1828,7 +1828,7 @@ iwm_nibblize_track_525(Disk *dsk, Trk *trk, byte *track_buf, int qtr_track) word_ptr = (word32 *)&(trk->nib_area[0]); -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val = 0xff08ff08; #else val = 0x08ff08ff; @@ -1933,7 +1933,7 @@ iwm_nibblize_track_35(Disk *dsk, Trk *trk, byte *track_buf, int qtr_track) int i; word_ptr = (word32 *)&(trk->nib_area[0]); -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val = 0xff08ff08; #else val = 0x08ff08ff; diff --git a/src/kegs32.aps b/src/kegs32.aps deleted file mode 100644 index 7e93301186ff4df49ce21c30500a8ae23aed8323..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59964 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 NfOmdBz@v5J{{cYzFLnR` diff --git a/src/macdriver.c b/src/macdriver.c index 0e90b21..27126c1 100644 --- a/src/macdriver.c +++ b/src/macdriver.c @@ -121,7 +121,7 @@ extern int g_screen_redraw_skip_amt; extern word32 g_a2_screen_buffer_changed; extern char *g_status_ptrs[MAX_STATUS_LINES]; -extern const char g_kegs_version_str[]; +extern const char g_gsport_version_str[]; #if 0 extern int g_debug_file_fd; @@ -141,7 +141,7 @@ printf(const char *fmt, ...) fprintf(stdout, "g_debug_file_fd = %d, %d\n", g_debug_file_fd, errno); } - ret = kegs_vprintf(fmt, ap); + ret = gsport_vprintf(fmt, ap); va_end(ap); @@ -166,19 +166,19 @@ show_simple_alert(char *str1, char *str2, char *str3, int num) { char buf[256]; - g_fatal_log_strs[0] = kegs_malloc_str(str1); - g_fatal_log_strs[1] = kegs_malloc_str(str2); - g_fatal_log_strs[2] = kegs_malloc_str(str3); + g_fatal_log_strs[0] = gsport_malloc_str(str1); + g_fatal_log_strs[1] = gsport_malloc_str(str2); + g_fatal_log_strs[2] = gsport_malloc_str(str3); g_fatal_log = 3; if(num != 0) { snprintf(buf, 250, ": %d", num); - g_fatal_log_strs[g_fatal_log++] = kegs_malloc_str(buf); + g_fatal_log_strs[g_fatal_log++] = gsport_malloc_str(buf); } x_show_alert(0, 0); } void -x_dialog_create_kegs_conf(const char *str) +x_dialog_create_gsport_conf(const char *str) { char *path; char tmp_buf[512]; @@ -278,7 +278,7 @@ my_cmd_handler( EventHandlerCallRef handlerRef, EventRef event, void *userdata) osresult = noErr; break; case 'abou': - show_simple_alert("GSport v", (char *)g_kegs_version_str, + show_simple_alert("GSport v", (char *)g_gsport_version_str, ", Copyright 2010 GSport Contributors\n" "Latest version at http://gsport.sourceforge.net/\n", 0); osresult = noErr; @@ -390,7 +390,7 @@ dummy_event_handler(EventHandlerCallRef call_ref, EventRef in_event, err = InstallApplicationEventHandler(g_quit_handler_UPP, 1, &event_spec, NULL, &installed_handler); - kegsmain(g_mac_argc, g_mac_argv); + gsportmain(g_mac_argc, g_mac_argv); return noErr; } diff --git a/src/moremem.c b/src/moremem.c index 6436a1a..a5a5052 100644 --- a/src/moremem.c +++ b/src/moremem.c @@ -27,7 +27,7 @@ const char rcsid_moremem_c[] = "@(#)$KmKId: moremem.c,v 1.251 2004-11-19 01:55:5 #include "tfe/protos_tfe.h" #endif -extern char g_kegs_version_str[]; +extern char g_gsport_version_str[]; extern byte *g_memory_ptr; extern byte *g_dummy_memory1_ptr; @@ -1273,8 +1273,8 @@ io_read(word32 loc, double *cyc_ptr) return 'G'; case 2: g_em_emubyte_cnt = 0; - tmp = g_kegs_version_str[0] - '0'; - i = g_kegs_version_str[2] - '0'; + tmp = g_gsport_version_str[0] - '0'; + i = g_gsport_version_str[2] - '0'; return ((tmp & 0xf) << 4) + (i & 0xf); default: g_em_emubyte_cnt = 0; @@ -2399,7 +2399,7 @@ in_vblank(double dcycs) /* horizontal video counter goes from 0x00,0x40 - 0x7f, then 0x80,0xc0-0xff */ /* over 2*65 cycles. The last visible screen pos is 0x7f and 0xff */ -/* This matches KEGS starting line 0 at the border for line -1 */ +/* This matches GSport starting line 0 at the border for line -1 */ int read_vid_counters(int loc, double dcycs) { diff --git a/src/os2driver.c b/src/os2driver.c index 239ec9c..701807c 100644 --- a/src/os2driver.c +++ b/src/os2driver.c @@ -63,7 +63,7 @@ win_nonblock_read_stdin(int fd, char *bufptr, int len) } void -x_dialog_create_kegs_conf(const char *str) +x_dialog_create_gsport_conf(const char *str) { } @@ -80,8 +80,8 @@ main(int argc, char **argv) { printf("In OS/2 main...\n"); - // Call kegsmain - return kegsmain(argc, argv); + // Call gsportmain + return gsportmain(argc, argv); } diff --git a/src/protos.h b/src/protos.h index 9162281..fec5ba5 100644 --- a/src/protos.h +++ b/src/protos.h @@ -22,7 +22,7 @@ /* xdriver.c and macdriver.c and windriver.c */ int x_show_alert(int is_fatal, const char *str); int win_nonblock_read_stdin(int fd, char *bufptr, int len); -void x_dialog_create_kegs_conf(const char *str); +void x_dialog_create_gsport_conf(const char *str); void update_color_array(int col_num, int a2_color); void set_border_color(int val); void x_update_physical_colormap(void); @@ -162,10 +162,10 @@ void config_vbl_update(int doit_3_persec); void config_parse_option(char *buf, int pos, int len, int line); void config_parse_bram(char *buf, int pos, int len); void config_load_roms(void); -void config_parse_config_kegs_file(void); +void config_parse_config_gsport_file(void); Disk *cfg_get_dsk_from_slot_drive(int slot, int drive); -void config_generate_config_kegs_name(char *outstr, int maxlen, Disk *dsk, int with_extras); -void config_write_config_kegs_file(void); +void config_generate_config_gsport_name(char *outstr, int maxlen, Disk *dsk, int with_extras); +void config_write_config_gsport_file(void); void insert_disk(int slot, int drive, const char *name, int ejected, int force_size, const char *partition_name, int part_num); void eject_named_disk(Disk *dsk, const char *name, const char *partition_name); void eject_disk_by_num(int slot, int drive); @@ -392,10 +392,10 @@ void do_reset(void); void check_engine_asm_defines(void); byte *memalloc_align(int size, int skip_amt, void **alloc_ptr); void memory_ptr_init(void); -int kegsmain(int argc, char **argv); +int gsportmain(int argc, char **argv); void load_roms_init_memory(void); -void kegs_expand_path(char *out_ptr, const char *in_ptr, int maxlen); -void setup_kegs_file(char *outname, int maxlen, int ok_if_missing, int can_create_file, const char **name_ptr); +void gsport_expand_path(char *out_ptr, const char *in_ptr, int maxlen); +void setup_gsport_file(char *outname, int maxlen, int ok_if_missing, int can_create_file, const char **name_ptr); void initialize_events(void); void check_for_one_event_type(int type); void add_event_entry(double dcycs, int type); @@ -429,10 +429,10 @@ void do_wai(void); void do_stp(void); void size_fail(int val, word32 v1, word32 v2); int fatal_printf(const char *fmt, ...); -int kegs_vprintf(const char *fmt, va_list ap); +int gsport_vprintf(const char *fmt, va_list ap); void must_write(int fd, char *bufptr, int len); void clear_fatal_logs(void); -char *kegs_malloc_str(char *in_str); +char *gsport_malloc_str(char *in_str); /* smartport.c */ diff --git a/src/protos_macdriver.h b/src/protos_macdriver.h index 2c5daeb..05c16d9 100644 --- a/src/protos_macdriver.h +++ b/src/protos_macdriver.h @@ -26,7 +26,7 @@ const char rcsid_protos_mac_h[] = "@(#)$KmKId: protos_macdriver.h,v 1.11 2004-11 /* macdriver.c */ pascal OSStatus quit_event_handler(EventHandlerCallRef call_ref, EventRef event, void *ignore); void show_simple_alert(char *str1, char *str2, char *str3, int num); -void x_dialog_create_kegs_conf(const char *str); +void x_dialog_create_gsport_conf(const char *str); int x_show_alert(int is_fatal, const char *str); pascal OSStatus my_cmd_handler(EventHandlerCallRef handlerRef, EventRef event, void *userdata); void update_window(void); diff --git a/src/protos_xdriver.h b/src/protos_xdriver.h index c11721b..12eaead 100644 --- a/src/protos_xdriver.h +++ b/src/protos_xdriver.h @@ -25,7 +25,7 @@ const char rcsid_protos_x_h[] = "@(#)$KmKId: protos_xdriver.h,v 1.19 2004-11-15 /* xdriver.c */ int main(int argc, char **argv); -void x_dialog_create_kegs_conf(const char *str); +void x_dialog_create_gsport_conf(const char *str); int x_show_alert(int is_fatal, const char *str); void x_update_color(int col_num, int red, int green, int blue, word32 rgb); void x_update_physical_colormap(void); diff --git a/src/resource b/src/resource index 0e1f280..13fcc90 100644 --- a/src/resource +++ b/src/resource @@ -1,13 +1,13 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by kegs32.rc +// Used by gsport32.rc // #define IDD_ABOUT_DIALOG 101 -#define IDC_KEGS32 102 +#define IDC_GSPORT32 102 #define IDR_TOOLBAR 103 #define IDD_DLG_DISKCONF 104 #define IDR_ACCEL 105 -#define IDD_KEGS32_KEY 106 +#define IDD_GSPORT32_KEY 106 #define IDD_SPEEDDIALOG 117 #define IDC_SLOW 1007 #define IDC_CUSTOM 1008 diff --git a/src/resource.h b/src/resource.h index eebe4cd..289d009 100644 --- a/src/resource.h +++ b/src/resource.h @@ -1,13 +1,13 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by kegs32.rc +// Used by gsport32.rc // #define IDD_ABOUT_DIALOG 101 -#define IDC_KEGS32 102 +#define IDC_GSPORT32 102 #define IDR_TOOLBAR 103 #define IDD_DLG_DISKCONF 104 #define IDR_ACCEL 105 -#define IDD_KEGS32_KEY 106 +#define IDD_GSPORT32_KEY 106 #define ID_TOOLBAR 5000 #define ID_STATUSBAR 5001 #define IDC_EDIT_S5D1 10051 diff --git a/src/scc_socket_driver.c b/src/scc_socket_driver.c index 735b3c0..f425962 100644 --- a/src/scc_socket_driver.c +++ b/src/scc_socket_driver.c @@ -746,7 +746,7 @@ scc_socket_empty_writebuf(int port, double dcycs) # else /* ignore SIGPIPE around writes to the socket, so we */ /* can catch a closed socket and prepare to accept */ - /* a new connection. Otherwise, SIGPIPE kills KEGS */ + /* a new connection. Otherwise, SIGPIPE kills GSport */ sigemptyset(&newact.sa_mask); newact.sa_handler = SIG_IGN; newact.sa_flags = 0; diff --git a/src/sim65816.c b/src/sim65816.c index 0d0deda..10b3b1e 100644 --- a/src/sim65816.c +++ b/src/sim65816.c @@ -38,7 +38,7 @@ const char rcsid_sim65816_c[] = "@(#)$KmKId: sim65816.c,v 1.367 2004-11-22 02:39 char g_argv0_path[256] = "./"; -const char *g_kegs_default_paths[] = { "", "./", "${HOME}/", +const char *g_gsport_default_paths[] = { "", "./", "${HOME}/", "${HOME}/Library/GSport/", "${0}/Contents/Resources/", "/usr/local/lib/", "/usr/local/gsport/", "/usr/local/lib/gsport/", "/usr/share/gsport/", @@ -132,7 +132,7 @@ char* g_printer_font_script = "script.ttf"; char* g_printer_font_ocra = "ocra.ttf"; int g_config_iwm_vbl_count = 0; -const char g_kegs_version_str[] = "0.1"; +const char g_gsport_version_str[] = "0.1"; #define START_DCYCS (0.0) @@ -780,7 +780,7 @@ int g_screen_depth = 8; int -kegsmain(int argc, char **argv) +gsportmain(int argc, char **argv) { int skip_amt; int diff; @@ -940,7 +940,7 @@ kegsmain(int argc, char **argv) #ifdef HAVE_PARALLEL printer_init(g_printer_dpi,85,110,g_printer_output,g_printer_multipage); #endif - //If ethernet is enabled in config.kegs, lets initialize it + //If ethernet is enabled in config.gsport, lets initialize it #ifdef HAVE_TFE if (g_ethernet == 1) { @@ -949,7 +949,7 @@ kegsmain(int argc, char **argv) char *ppdes = NULL; if (tfe_enumadapter_open()) { - //Loop through the available adapters until we reach the interface number specified in config.kegs + //Loop through the available adapters until we reach the interface number specified in config.gsport while(tfe_enumadapter(&ppname,&ppdes)) { if (i == g_ethernet_interface) break; @@ -1022,7 +1022,7 @@ load_roms_init_memory() } void -kegs_expand_path(char *out_ptr, const char *in_ptr, int maxlen) +gsport_expand_path(char *out_ptr, const char *in_ptr, int maxlen) { char name_buf[256]; char *tmp_ptr; @@ -1088,7 +1088,7 @@ kegs_expand_path(char *out_ptr, const char *in_ptr, int maxlen) } void -setup_kegs_file(char *outname, int maxlen, int ok_if_missing, +setup_gsport_file(char *outname, int maxlen, int ok_if_missing, int can_create_file, const char **name_ptr) { char local_path[256]; @@ -1099,11 +1099,11 @@ setup_kegs_file(char *outname, int maxlen, int ok_if_missing, outname[0] = 0; - path_ptr = &g_kegs_default_paths[0]; + path_ptr = &g_gsport_default_paths[0]; save_path_ptr = path_ptr; while(*path_ptr) { - kegs_expand_path(&(local_path[0]), *path_ptr, 250); + gsport_expand_path(&(local_path[0]), *path_ptr, 250); cur_name_ptr = name_ptr; while(*cur_name_ptr) { strcpy(outname, &(local_path[0])); @@ -1136,12 +1136,12 @@ setup_kegs_file(char *outname, int maxlen, int ok_if_missing, if(can_create_file) { // Ask user if it's OK to create the file - x_dialog_create_kegs_conf(*name_ptr); + x_dialog_create_gsport_conf(*name_ptr); can_create_file = 0; // But clear out the fatal_printfs first clear_fatal_logs(); - setup_kegs_file(outname, maxlen, ok_if_missing, + setup_gsport_file(outname, maxlen, ok_if_missing, can_create_file, name_ptr); // It's one-level of recursion--it cannot loop since we // clear can_create_file. @@ -2003,7 +2003,7 @@ update_60hz(double dcycs, double dtime_now) sprintf(status_buf, "GSport v%-6s " "Press F4 for Config Menu %s", - g_kegs_version_str, code_str2); + g_gsport_version_str, code_str2); video_update_status_line(6, status_buf); g_status_refresh_needed = 1; @@ -2456,14 +2456,14 @@ fatal_printf(const char *fmt, ...) if(g_fatal_log < 0) { g_fatal_log = 0; } - ret = kegs_vprintf(fmt, ap); + ret = gsport_vprintf(fmt, ap); va_end(ap); return ret; } int -kegs_vprintf(const char *fmt, va_list ap) +gsport_vprintf(const char *fmt, va_list ap) { char *bufptr, *buf2ptr; int len; @@ -2516,7 +2516,7 @@ clear_fatal_logs() } char * -kegs_malloc_str(char *in_str) +gsport_malloc_str(char *in_str) { char *str; int len; diff --git a/src/smartport.c b/src/smartport.c index b86c9aa..e4e30a7 100644 --- a/src/smartport.c +++ b/src/smartport.c @@ -644,7 +644,7 @@ do_write_c7(int unit_num, word32 buf, int blk) val1 = get_memory16_c(buf + i, 0); val2 = get_memory16_c(buf + i + 2, 0); /* reorder the little-endian bytes to be big-endian */ -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val = (val2 << 16) + val1; #else val = (val1 << 24) + ((val1 << 8) & 0xff0000) + diff --git a/src/sound.c b/src/sound.c index 9f75e94..78ee5d5 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1025,7 +1025,7 @@ sound_play(double dsamps) #if defined(__linux__) || defined(OSS) /* Linux seems to expect little-endian */ /* samples always, even on PowerPC */ -# ifdef KEGS_LITTLE_ENDIAN +# ifdef GSPORT_LITTLE_ENDIAN sndptr[pos] = (val << 16) + (val0 & 0xffff); # else sndptr[pos] = ((val & 0xff) << 24) + @@ -1034,7 +1034,7 @@ sound_play(double dsamps) ((val0 >> 8) & 0xff); # endif #else -# ifdef KEGS_LITTLE_ENDIAN +# ifdef GSPORT_LITTLE_ENDIAN sndptr[pos] = (val << 16) + (val0 & 0xffff); # else sndptr[pos] = (val0 << 16) + (val & 0xffff); diff --git a/src/sound_driver.c b/src/sound_driver.c index 57d44d2..aebcaee 100644 --- a/src/sound_driver.c +++ b/src/sound_driver.c @@ -396,7 +396,7 @@ child_sound_init_linux() exit(1); } -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN fmt = AFMT_S16_LE; #else fmt = AFMT_S16_BE; diff --git a/src/superhires.h b/src/superhires.h index 6169c79..380e92a 100644 --- a/src/superhires.h +++ b/src/superhires.h @@ -84,7 +84,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan, (pal << 4); if(mode_640 && !use_a2vid_palette) { -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN pal_word += 0x04000c08; #else pal_word += 0x080c0004; @@ -121,7 +121,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan, pix3 = palptr[pix3+4]; } #if SUPER_PIXEL_SIZE == 8 -# ifdef KEGS_LITTLE_ENDIAN +# ifdef GSPORT_LITTLE_ENDIAN tmp = (pix3 << 24) + (pix2 << 16) + (pix1 << 8) + pix0 + pal_word; # else @@ -130,7 +130,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan, # endif *img_ptr++ = tmp; *img_ptr2++ = tmp; #elif SUPER_PIXEL_SIZE == 16 -# ifdef KEGS_LITTLE_ENDIAN +# ifdef GSPORT_LITTLE_ENDIAN tmp = (pix1 << 16) + pix0; tmp2 = (pix3 << 16) + pix2; # else @@ -192,7 +192,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan, printf("y:%d, x2:%d, val:%02x = %08x %08x\n", y, x2, val0, pix0, pix1); } #if SUPER_PIXEL_SIZE == 8 -# ifdef KEGS_LITTLE_ENDIAN +# ifdef GSPORT_LITTLE_ENDIAN tmp = (pix1 << 24) + (pix1 << 16) + (pix0 << 8) + pix0 + pal_word; # else diff --git a/src/vars_kegs32 b/src/vars_kegs32 index 7d1fa96..0257d70 100644 --- a/src/vars_kegs32 +++ b/src/vars_kegs32 @@ -1,9 +1,9 @@ -TARGET = gsportwin.exe -OBJECTS = $(OBJECTS1) win32snd_driver.o windriver.o kegs32.o -CCOPTS = -O2 -DKEGS_LITTLE_ENDIAN +TARGET = gsport.exe +OBJECTS = $(OBJECTS1) win32snd_driver.o windriver.o gsport32.o +CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN SUFFIX = ".exe" -NAME = gsportwin +NAME = gsport XOPTS = -Wall -fomit-frame-pointer -march=pentium XLIBS = diff --git a/src/vars_win32 b/src/vars_win32 index 4e4ab07..ca463c9 100644 --- a/src/vars_win32 +++ b/src/vars_win32 @@ -1,10 +1,10 @@ -TARGET = gsportwin.exe +TARGET = gsport.exe TFEOBJ = tfe/tfe.o arch/win32/tfearch.o tfe/tfesupp.o OBJECTS = $(OBJECTS1) $(TFEOBJ) scc_windriver.o win32snd_driver.o windriver.o -CCOPTS = -O2 -DKEGS_LITTLE_ENDIAN -DHAVE_TFE +CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE SUFFIX = ".exe" -NAME = gsportwin +NAME = gsport XOPTS = -Wall -fomit-frame-pointer -march=pentium XLIBS = diff --git a/src/vars_x86linux b/src/vars_x86linux index 5f1b64d..3fe2a8c 100644 --- a/src/vars_x86linux +++ b/src/vars_x86linux @@ -3,7 +3,7 @@ TARGET = gsportx OBJECTS = $(OBJECTS1) xdriver.o CC = cc CCOPTS = -O2 -Wall -fomit-frame-pointer -march=pentium -OPTS = -DKEGS_LITTLE_ENDIAN +OPTS = -DGSPORT_LITTLE_ENDIAN SUFFIX = NAME = gsportx LDFLAGS = diff --git a/src/vars_x86solaris b/src/vars_x86solaris index a995279..e7a2ca8 100644 --- a/src/vars_x86solaris +++ b/src/vars_x86solaris @@ -3,7 +3,7 @@ TARGET = gsportx OBJECTS = $(OBJECTS1) xdriver.o CC = gcc CCOPTS = -O -OPTS = -DNDEBUG -DSOLARIS -DKEGS_LITTLE_ENDIAN -DSOLARISSOUND +OPTS = -DNDEBUG -DSOLARIS -DGSPORT_LITTLE_ENDIAN -DSOLARISSOUND SUFFIX = NAME = gsportx LDFLAGS = diff --git a/src/video.c b/src/video.c index 1e3c456..765fd3e 100644 --- a/src/video.c +++ b/src/video.c @@ -453,7 +453,7 @@ video_init() val1 = g_dhires_colors_16[col[1] & 0xf]; val2 = g_dhires_colors_16[col[2] & 0xf]; val3 = g_dhires_colors_16[col[3] & 0xf]; -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val = (val3 << 24) + (val2 << 16) + (val1 << 8) + val0; #else val = (val0 << 24) + (val1 << 16) + (val2 << 8) + val3; @@ -1531,7 +1531,7 @@ redraw_changed_gr(int start_offset, int start_line, int num_lines, int reparse, (val0 << 8) + val0; val1_wd = (val1 << 24) + (val1 << 16) + (val1 << 8) + val1; -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val01_wd = (val1_wd << 16) + (val0_wd & 0xffff); #else val01_wd = (val0_wd << 16) + (val1_wd & 0xffff); @@ -1671,7 +1671,7 @@ redraw_changed_dbl_gr(int start_offset, int start_line, int num_lines, (val2 << 8) + val2; val3_wd = (val3 << 24) + (val3 << 16) + (val3 << 8) + val3; -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN val01_wd = (val1_wd << 24) + (val0_wd&0xffffff); val12_wd = (val2_wd << 16) + (val1_wd & 0xffff); val23_wd = (val3_wd << 8) + (val2_wd & 0xff); @@ -2905,7 +2905,7 @@ end_screen() } byte g_font_array[256][8] = { -#include "kegsfont.h" +#include "gsportfont.h" }; void diff --git a/src/win32.rc b/src/win32.rc index c048034..1c71181 100644 --- a/src/win32.rc +++ b/src/win32.rc @@ -12,7 +12,7 @@ // Menu // -IDC_KEGS32 MENU DISCARDABLE +IDC_GSPORT32 MENU DISCARDABLE BEGIN POPUP "&Emulator" BEGIN @@ -38,14 +38,14 @@ END // RT_MANIFEST // -// CREATEPROCESS_MANIFEST RT_MANIFEST "kegs.manifest" +// CREATEPROCESS_MANIFEST RT_MANIFEST "gsport.manifest" ///////////////////////////////////////////////////////////////////////////// // // Bitmap // -IDC_KEGS32 BITMAP DISCARDABLE "wintoolbar.bmp" +IDC_GSPORT32 BITMAP DISCARDABLE "wintoolbar.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -65,8 +65,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDC_KEGS32 ICON DISCARDABLE "win32.ico" -KEGS32_ICON ICON DISCARDABLE "win32.ico" +IDC_GSPORT32 ICON DISCARDABLE "win32.ico" +GSPORT32_ICON ICON DISCARDABLE "win32.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -81,7 +81,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,78,61,50,14 LTEXT "GSport: GS Emulator.\nBased on KEGS by Kent Dickey\nWindows Port by Chea Chee Keong\n\nThis software is licensed under GNU GPL.", IDC_STATIC,38,7,162,45,NOT WS_GROUP - ICON "KEGS32_ICON",IDC_STATIC,7,7,21,20,0 + ICON "GSPORT32_ICON",IDC_STATIC,7,7,21,20,0 END IDD_DLG_DISKCONF DIALOGEX 0, 0, 268, 182 @@ -139,10 +139,10 @@ BEGIN GROUPBOX "Speed Control",IDC_STATIC,7,7,226,96,WS_GROUP LTEXT "Adjust the speed of your emulator by selecting the appropriate speed control", IDC_STATIC,46,19,181,19,NOT WS_GROUP - ICON IDC_KEGS32,IDC_STATIC,14,19,21,20 + ICON IDC_GSPORT32,IDC_STATIC,14,19,21,20 END -IDD_KEGS32_KEY DIALOG 0, 0, 186, 172 +IDD_GSPORT32_KEY DIALOG 0, 0, 186, 172 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Help About Key Commands" FONT 8, "MS Sans Serif" diff --git a/src/windriver.c b/src/windriver.c index 16d5a5f..93ce38e 100644 --- a/src/windriver.c +++ b/src/windriver.c @@ -221,7 +221,7 @@ win_nonblock_read_stdin(int fd, char *bufptr, int len) } void -x_dialog_create_kegs_conf(const char *str) +x_dialog_create_gsport_conf(const char *str) { } @@ -434,7 +434,7 @@ main(int argc, char **argv) wndclass.hCursor = LoadCursor((HINSTANCE) NULL, IDC_ARROW); wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = "gsportwin"; + wndclass.lpszClassName = "gsport"; // Register the window if(!RegisterClass(&wndclass)) { @@ -445,7 +445,7 @@ main(int argc, char **argv) height = X_A2_WINDOW_HEIGHT + (MAX_STATUS_LINES * 16) + 32; g_main_height = height; - g_hwnd_main = CreateWindowEx(WS_EX_ACCEPTFILES, "gsportwin", "GSportWin - Apple //gs Emulator", + g_hwnd_main = CreateWindowEx(WS_EX_ACCEPTFILES, "gsport", "GSport - Apple //gs Emulator", WS_TILED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, X_A2_WINDOW_WIDTH, height, @@ -467,8 +467,8 @@ main(int argc, char **argv) g_screen_mdepth = 32; - // Call kegsmain - return kegsmain(argc, argv); + // Call gsportmain + return gsportmain(argc, argv); } diff --git a/src/winresource.h b/src/winresource.h index 7d5d615..f40907f 100644 --- a/src/winresource.h +++ b/src/winresource.h @@ -5,11 +5,11 @@ // #define CREATEPROCESS_MANIFEST 1 #define IDD_ABOUT_DIALOG 101 -#define IDC_KEGS32 102 +#define IDC_GSPORT32 102 #define IDR_TOOLBAR 103 #define IDD_DLG_DISKCONF 104 #define IDR_ACCEL 105 -#define IDD_KEGS32_KEY 106 +#define IDD_GSPORT32_KEY 106 #define ID_TOOLBAR 5000 #define ID_STATUSBAR 5001 #define IDC_EDIT_S5D1 10051 diff --git a/src/xdriver.c b/src/xdriver.c index d4e6f8f..61954ed 100644 --- a/src/xdriver.c +++ b/src/xdriver.c @@ -256,11 +256,11 @@ int a2_key_to_xsym[][3] = { int main(int argc, char **argv) { - return kegsmain(argc, argv); + return gsportmain(argc, argv); } void -x_dialog_create_kegs_conf(const char *str) +x_dialog_create_gsport_conf(const char *str) { /* do nothing -- not implemented yet */ return; @@ -898,7 +898,7 @@ get_ximage(Kimage *kimage_ptr) xim = XCreateImage(g_display, g_vis, depth, ZPixmap, 0, (char *)ptr, width, height, 8, 0); -#ifdef KEGS_LITTLE_ENDIAN +#ifdef GSPORT_LITTLE_ENDIAN xim->byte_order = LSBFirst; #else xim->byte_order = MSBFirst;