mirror of
https://github.com/digarok/gsplus.git
synced 2024-06-01 08:41:36 +00:00
branding update - minor cleanup
This commit is contained in:
Dagen Brock
parent
b60f66c3f7
commit
7f14207be3
BIN
bin/osx/gsplus
Executable file → Normal file
BIN
bin/osx/gsplus
Executable file → Normal file
Binary file not shown.
|
|
@ -32,7 +32,7 @@ sudo gitlab-ci-multi-runner register
|
|||
sudo visudo
|
||||
|
||||
# Add build user to the end of the file, like:
|
||||
dbrock ALL=(ALL) NOPASSWD: ALL
|
||||
gitlab-runner ALL=(ALL) NOPASSWD: ALL
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ sudo chmod +x /usr/local/bin/gitlab-ci-multi-runner
|
|||
sudo gitlab-ci-multi-runner register
|
||||
|
||||
|
||||
## or, example with all parameters for headless setup
|
||||
|
||||
gitlab-ci-multi-runner register -n \
|
||||
--url http://yourserv.gotgeeks.com/ci \
|
||||
--registration-token 1234 \
|
||||
--url http://yourserv.com/ci \
|
||||
--registration-token a1f60647cf7fe3eb5c7fa87e59bf7 \
|
||||
--executor shell \
|
||||
--description "Dagens-MBP"
|
||||
--description "My-Mac"
|
||||
|
|
|
|||
|
|
@ -162,8 +162,8 @@ SIZEL sizel;
|
|||
g_hdc_memory = DevOpenDC(g_hab, OD_MEMORY, "*", 4, (PDEVOPENDATA)&pszData, NULL);
|
||||
g_hps_memory = GpiCreatePS(g_hab,g_hdc_memory, &sizel, PU_ARBITRARY | GPIT_MICRO | GPIA_ASSOC);
|
||||
|
||||
// Call gsportmain
|
||||
return gsportmain(argc, argv);
|
||||
// Call gsplusmain
|
||||
return gsplusmain(argc, argv);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
extern int Verbose;
|
||||
extern word32 g_vbl_count; // OG change int to word32
|
||||
extern int g_rom_version;
|
||||
extern int g_config_gsport_update_needed;
|
||||
extern int g_config_gsplus_update_needed;
|
||||
|
||||
#define CLK_IDLE 1
|
||||
#define CLK_TIME 2
|
||||
|
|
@ -185,7 +185,7 @@ clk_calculate_bram_checksum(void) {
|
|||
}
|
||||
checksum &= 0xFFFF;
|
||||
checksum += ((checksum ^ 0xAAAA) << 16);
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
g_bram_ptr[252] = (checksum & 0xFF);
|
||||
g_bram_ptr[253] = (checksum >> 8);
|
||||
g_bram_ptr[254] = (checksum >> 16);
|
||||
|
|
@ -385,7 +385,7 @@ do_clock_data()
|
|||
}
|
||||
clk_printf("Writing BRAM loc %02x with %02x\n",
|
||||
g_clk_reg1, g_c033_data);
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
}
|
||||
g_clk_mode = CLK_IDLE;
|
||||
|
|
|
|||
121
src/config.c
121
src/config.c
|
|
@ -126,16 +126,17 @@ extern byte g_temp_boot_slot;
|
|||
extern byte g_orig_boot_slot;
|
||||
|
||||
extern int g_key_down;
|
||||
extern const char g_gsport_version_str[];
|
||||
extern const char g_gsplus_version_str[];
|
||||
int g_config_control_panel = 0;
|
||||
char g_config_gsport_name[1024];
|
||||
char g_config_gsplus_name[1024];
|
||||
char g_cfg_cwd_str[CFG_PATH_MAX] = { 0 };
|
||||
|
||||
int g_config_gsport_auto_update = 1;
|
||||
int g_config_gsport_update_needed = 0;
|
||||
int g_config_gsplus_auto_update = 1;
|
||||
int g_config_gsplus_update_needed = 0;
|
||||
|
||||
const char *g_config_gsport_name_list[] = {
|
||||
"config.txt", "config.gsport", "gsport_conf", ".config.gsport", 0
|
||||
const char *g_config_gsplus_name_list[] = {
|
||||
"config.txt", "config.gsport", "gsport_conf", ".config.gsport",
|
||||
".gsplus", "config.gsplus",0
|
||||
};
|
||||
|
||||
int g_highest_smartport_unit = -1;
|
||||
|
|
@ -145,7 +146,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_gsport_buf[CONF_BUF_LEN];
|
||||
char g_config_gsplus_buf[CONF_BUF_LEN];
|
||||
|
||||
word32 g_cfg_vbl_count = 0;
|
||||
|
||||
|
|
@ -370,7 +371,7 @@ Cfg_menu g_cfg_devel_menu[] = {
|
|||
};
|
||||
|
||||
Cfg_menu g_cfg_main_menu[] = {
|
||||
{ "GSport Configuration", g_cfg_main_menu, 0, 0, CFGTYPE_MENU },
|
||||
{ "GSplus Configuration", g_cfg_main_menu, 0, 0, CFGTYPE_MENU },
|
||||
{ "Disk Configuration", g_cfg_disk_menu, 0, 0, CFGTYPE_MENU },
|
||||
{ "Joystick Configuration", g_cfg_joystick_menu, 0, 0, CFGTYPE_MENU },
|
||||
{ "ROM File Selection", g_cfg_rom_menu, 0, 0, CFGTYPE_MENU },
|
||||
|
|
@ -383,7 +384,7 @@ Cfg_menu g_cfg_main_menu[] = {
|
|||
#endif
|
||||
{ "Developer Options", g_cfg_devel_menu, 0, 0, CFGTYPE_MENU },
|
||||
{ "Auto-update configuration file,0,Manual,1,Immediately",
|
||||
KNMP(g_config_gsport_auto_update), CFGTYPE_INT },
|
||||
KNMP(g_config_gsplus_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,"
|
||||
|
|
@ -394,7 +395,7 @@ Cfg_menu g_cfg_main_menu[] = {
|
|||
{ "Reset Virtual ImageWriter", (void *)cfg_iwreset, 0, 0, CFGTYPE_FUNC },
|
||||
#endif
|
||||
{ "", 0, 0, 0, 0 },
|
||||
{ "Save changes to configuration file", (void *)config_write_config_gsport_file, 0, 0,
|
||||
{ "Save changes to configuration file", (void *)config_write_config_gsplus_file, 0, 0,
|
||||
CFGTYPE_FUNC },
|
||||
{ "", 0, 0, 0, 0 },
|
||||
{ "Exit Config (or press F4)", (void *)cfg_exit, 0, 0, CFGTYPE_FUNC },
|
||||
|
|
@ -421,23 +422,23 @@ Cfg_listhdr g_cfg_partitionlist = { 0 };
|
|||
|
||||
int g_cfg_file_pathfield = 0;
|
||||
|
||||
const char *g_gsport_rom_names[] = { "ROM", "ROM", "ROM.01", "ROM.03", 0 };
|
||||
const char *g_gsplus_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_gsport_c1rom_names[] = { "parallel.rom", 0 };
|
||||
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",
|
||||
const char *g_gsplus_c1rom_names[] = { "parallel.rom", 0 };
|
||||
const char *g_gsplus_c2rom_names[] = { 0 };
|
||||
const char *g_gsplus_c3rom_names[] = { 0 };
|
||||
const char *g_gsplus_c4rom_names[] = { 0 };
|
||||
const char *g_gsplus_c5rom_names[] = { 0 };
|
||||
const char *g_gsplus_c6rom_names[] = { "c600.rom", "controller.rom", "disk.rom",
|
||||
"DISK.ROM", "diskII.prom", 0 };
|
||||
const char *g_gsport_c7rom_names[] = { 0 };
|
||||
const char *g_gsplus_c7rom_names[] = { 0 };
|
||||
|
||||
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 };
|
||||
const char **g_gsplus_rom_card_list[8] = {
|
||||
0, g_gsplus_c1rom_names,
|
||||
g_gsplus_c2rom_names, g_gsplus_c3rom_names,
|
||||
g_gsplus_c4rom_names, g_gsplus_c5rom_names,
|
||||
g_gsplus_c6rom_names, g_gsplus_c7rom_names };
|
||||
|
||||
byte g_rom_c600_rom01_diffs[256] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0xe2, 0x00,
|
||||
|
|
@ -520,7 +521,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 = gsport_malloc_str(str);
|
||||
*str_ptr = gsplus_malloc_str(str);
|
||||
menuptr->defptr = &(defptr->strval);
|
||||
break;
|
||||
case CFGTYPE_FILE:
|
||||
|
|
@ -529,7 +530,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 = gsport_malloc_str(str);
|
||||
*str_ptr = gsplus_malloc_str(str);
|
||||
menuptr->defptr = &(defptr->strval);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -554,12 +555,12 @@ config_init()
|
|||
config_init_menus(g_cfg_main_menu);
|
||||
|
||||
// Find the configuration file
|
||||
g_config_gsport_name[0] = 0;
|
||||
g_config_gsplus_name[0] = 0;
|
||||
can_create = 1;
|
||||
setup_gsport_file(&g_config_gsport_name[0], sizeof(g_config_gsport_name), 0,
|
||||
can_create, &g_config_gsport_name_list[0]);
|
||||
setup_gsplus_file(&g_config_gsplus_name[0], sizeof(g_config_gsplus_name), 0,
|
||||
can_create, &g_config_gsplus_name_list[0]);
|
||||
|
||||
config_parse_config_gsport_file();
|
||||
config_parse_config_gsplus_file();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -591,7 +592,7 @@ cfg_text_screen_dump()
|
|||
int pos;
|
||||
int i, j;
|
||||
|
||||
filename = "gsport.screen.dump";
|
||||
filename = "gsplus.screen.dump";
|
||||
printf("Writing text screen to the file %s\n", filename);
|
||||
ofile = fopen(filename, "w");
|
||||
if(ofile == 0) {
|
||||
|
|
@ -673,8 +674,8 @@ void
|
|||
config_vbl_update(int doit_3_persec)
|
||||
{
|
||||
if(doit_3_persec) {
|
||||
if(g_config_gsport_auto_update && g_config_gsport_update_needed) {
|
||||
config_write_config_gsport_file();
|
||||
if(g_config_gsplus_auto_update && g_config_gsplus_update_needed) {
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
|
@ -760,14 +761,14 @@ config_parse_option(char *buf, int pos, int len, int line)
|
|||
if(strptr && *strptr) {
|
||||
free(*strptr);
|
||||
}
|
||||
*strptr = gsport_malloc_str(&buf[pos]);
|
||||
*strptr = gsplus_malloc_str(&buf[pos]);
|
||||
break;
|
||||
case CFGTYPE_FILE:
|
||||
strptr = (char **)menuptr->ptr;
|
||||
if(strptr && *strptr) {
|
||||
free(*strptr);
|
||||
}
|
||||
*strptr = gsport_malloc_str(&buf[pos]);
|
||||
*strptr = gsplus_malloc_str(&buf[pos]);
|
||||
break;
|
||||
default:
|
||||
printf("Config file variable %s is unknown type: %d\n",
|
||||
|
|
@ -825,11 +826,11 @@ config_load_roms()
|
|||
|
||||
g_rom_version = -1;
|
||||
|
||||
/* set first entry of g_gsport_rom_names[] to g_cfg_rom_path so that */
|
||||
/* set first entry of g_gsplus_rom_names[] to g_cfg_rom_path so that */
|
||||
/* it becomes the first place searched. */
|
||||
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]);
|
||||
g_gsplus_rom_names[0] = g_cfg_rom_path;
|
||||
setup_gsplus_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, -1, 0,
|
||||
&g_gsplus_rom_names[0]);
|
||||
|
||||
if(g_cfg_tmp_path[0] == 0) {
|
||||
// Just get out, let config interface select ROM
|
||||
|
|
@ -895,14 +896,14 @@ config_load_roms()
|
|||
}
|
||||
|
||||
for(i = 1; i < 8; i++) {
|
||||
names_ptr = g_gsport_rom_card_list[i];
|
||||
names_ptr = g_gsplus_rom_card_list[i];
|
||||
if(names_ptr == 0) {
|
||||
continue;
|
||||
}
|
||||
if(*names_ptr == 0) {
|
||||
continue;
|
||||
}
|
||||
setup_gsport_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, 1, 0,
|
||||
setup_gsplus_file(&g_cfg_tmp_path[0], CFG_PATH_MAX, 1, 0,
|
||||
names_ptr);
|
||||
if(g_cfg_tmp_path[0] != 0) {
|
||||
file = fopen(&(g_cfg_tmp_path[0]), "rb");
|
||||
|
|
@ -1013,7 +1014,7 @@ config_load_roms()
|
|||
}
|
||||
|
||||
void
|
||||
config_parse_config_gsport_file()
|
||||
config_parse_config_gsplus_file()
|
||||
{
|
||||
FILE *fconf;
|
||||
char *buf;
|
||||
|
|
@ -1037,7 +1038,7 @@ config_parse_config_gsport_file()
|
|||
|
||||
g_highest_smartport_unit = -1;
|
||||
|
||||
cfg_get_base_path(&g_cfg_cwd_str[0], g_config_gsport_name, 0);
|
||||
cfg_get_base_path(&g_cfg_cwd_str[0], g_config_gsplus_name, 0);
|
||||
#ifndef __OS2__
|
||||
if(g_cfg_cwd_str[0] != 0) {
|
||||
ret = chdir(&g_cfg_cwd_str[0]);
|
||||
|
|
@ -1049,16 +1050,16 @@ config_parse_config_gsport_file()
|
|||
(void)getcwd(&g_cfg_cwd_str[0], CFG_PATH_MAX);
|
||||
#endif
|
||||
|
||||
fconf = fopen(g_config_gsport_name, "r");
|
||||
fconf = fopen(g_config_gsplus_name, "r");
|
||||
if(fconf == 0) {
|
||||
fatal_printf("cannot open configuration file at %s! Stopping!\n",
|
||||
g_config_gsport_name);
|
||||
g_config_gsplus_name);
|
||||
my_exit(3);
|
||||
}
|
||||
|
||||
line = 0;
|
||||
while(1) {
|
||||
buf = &g_config_gsport_buf[0];
|
||||
buf = &g_config_gsplus_buf[0];
|
||||
ptr = fgets(buf, CONF_BUF_LEN, fconf);
|
||||
if(ptr == 0) {
|
||||
iwm_printf("Done reading disk_conf\n");
|
||||
|
|
@ -1207,7 +1208,7 @@ cfg_get_dsk_from_slot_drive(int slot, int drive)
|
|||
}
|
||||
|
||||
void
|
||||
config_generate_config_gsport_name(char *outstr, int maxlen, Disk *dsk,
|
||||
config_generate_config_gsplus_name(char *outstr, int maxlen, Disk *dsk,
|
||||
int with_extras)
|
||||
{
|
||||
char *str;
|
||||
|
|
@ -1235,7 +1236,7 @@ config_generate_config_gsport_name(char *outstr, int maxlen, Disk *dsk,
|
|||
}
|
||||
|
||||
void
|
||||
config_write_config_gsport_file()
|
||||
config_write_config_gsplus_file()
|
||||
{
|
||||
FILE *fconf;
|
||||
Disk *dsk;
|
||||
|
|
@ -1247,16 +1248,16 @@ config_write_config_gsport_file()
|
|||
int slot, drive;
|
||||
int i;
|
||||
|
||||
printf("Writing configuration file to %s\n", g_config_gsport_name);
|
||||
printf("Writing configuration file to %s\n", g_config_gsplus_name);
|
||||
|
||||
fconf = fopen(g_config_gsport_name, "w+");
|
||||
fconf = fopen(g_config_gsplus_name, "w+");
|
||||
if(fconf == 0) {
|
||||
halt_printf("cannot open %s! Stopping!\n",g_config_gsport_name);
|
||||
halt_printf("cannot open %s! Stopping!\n",g_config_gsplus_name);
|
||||
return;
|
||||
}
|
||||
|
||||
fprintf(fconf, "# GSport configuration file version %s\n",
|
||||
g_gsport_version_str);
|
||||
fprintf(fconf, "# GSplus configuration file version %s\n",
|
||||
g_gsplus_version_str);
|
||||
|
||||
for(i = 0; i < MAX_C7_DISKS + 4; i++) {
|
||||
slot = 7;
|
||||
|
|
@ -1279,7 +1280,7 @@ config_write_config_gsport_file()
|
|||
fprintf(fconf, "\n");
|
||||
continue;
|
||||
}
|
||||
config_generate_config_gsport_name(&g_cfg_tmp_path[0],
|
||||
config_generate_config_gsplus_name(&g_cfg_tmp_path[0],
|
||||
CFG_PATH_MAX, dsk, 1);
|
||||
fprintf(fconf, "%s\n", &g_cfg_tmp_path[0]);
|
||||
}
|
||||
|
|
@ -1324,7 +1325,7 @@ config_write_config_gsport_file()
|
|||
|
||||
fclose(fconf);
|
||||
|
||||
g_config_gsport_update_needed = 0;
|
||||
g_config_gsplus_update_needed = 0;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1352,7 +1353,7 @@ insert_disk(int slot, int drive, const char *name, int ejected, int force_size,
|
|||
int tmp;
|
||||
int i;
|
||||
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
|
||||
if((slot < 5) || (slot > 7)) {
|
||||
fatal_printf("Invalid slot for inserting disk: %d\n", slot);
|
||||
|
|
@ -1703,7 +1704,7 @@ eject_disk(Disk *dsk)
|
|||
return;
|
||||
}
|
||||
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
|
||||
motor_on = iwm.motor_on;
|
||||
if(g_c031_disk35 & 0x40) {
|
||||
|
|
@ -2133,7 +2134,7 @@ cfg_get_disk_name(char *outstr, int maxlen, int type_ext, int with_extras)
|
|||
return;
|
||||
}
|
||||
|
||||
config_generate_config_gsport_name(outstr, maxlen, dsk, with_extras);
|
||||
config_generate_config_gsplus_name(outstr, maxlen, dsk, with_extras);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -2359,7 +2360,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_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
|
@ -2940,7 +2941,7 @@ cfg_file_draw()
|
|||
}
|
||||
cfg_htab_vtab(2, 1);
|
||||
cfg_printf("Configuration file path: %-56s",
|
||||
cfg_shorten_filename(&g_config_gsport_name[0], 56));
|
||||
cfg_shorten_filename(&g_config_gsplus_name[0], 56));
|
||||
cfg_htab_vtab(2, 2);
|
||||
cfg_printf("Current directory: %-50s",
|
||||
cfg_shorten_filename(&g_cfg_cwd_str[0], 50));
|
||||
|
|
@ -3056,7 +3057,7 @@ cfg_file_update_ptr(char *str)
|
|||
printf("Updated ROM file\n");
|
||||
load_roms_init_memory();
|
||||
}
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
void
|
||||
cfg_file_selected()
|
||||
|
|
|
|||
|
|
@ -59,7 +59,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 GSPORT_LITTLE_ENDIAN
|
||||
#ifdef GSPLUS_LITTLE_ENDIAN
|
||||
# define BIGEND(a) ((((a) >> 24) & 0xff) + \
|
||||
(((a) >> 8) & 0xff00) + \
|
||||
(((a) << 8) & 0xff0000) + \
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ void x_push_done(void)
|
|||
void x_dialog_create_gsport_conf(const char *str)
|
||||
{
|
||||
// Just write the config file already...
|
||||
config_write_config_gsport_file();
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
int x_show_alert(int is_fatal, const char *str)
|
||||
{
|
||||
|
|
@ -553,7 +553,7 @@ int main(int argc,char *argv[])
|
|||
exit(-1);
|
||||
if (signal(SIGHUP, sig_bye) == SIG_ERR)
|
||||
exit(-1);
|
||||
gsportmain(argc, argv);
|
||||
gsplusmain(argc, argv);
|
||||
xdriver_end();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN_SOUND;GSPORT_LITTLE_ENDIAN;HAVE_TFE;HAVE_ATBRIDGE;TOGGLE_STATUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN_SOUND;GSPLUS_LITTLE_ENDIAN;HAVE_TFE;HAVE_ATBRIDGE;TOGGLE_STATUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
<Optimization>Full</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN_SOUND;GSPORT_LITTLE_ENDIAN;HAVE_ATBRIDGE;HAVE_TFE;TOGGLE_STATUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN_SOUND;GSPLUS_LITTLE_ENDIAN;HAVE_ATBRIDGE;HAVE_TFE;TOGGLE_STATUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
|
|
|
|||
10
src/iwm.c
10
src/iwm.c
|
|
@ -340,7 +340,7 @@ extern byte g_bram[2][256];
|
|||
extern byte* g_bram_ptr;
|
||||
extern byte g_temp_boot_slot;
|
||||
extern byte g_orig_boot_slot;
|
||||
extern int g_config_gsport_update_needed;
|
||||
extern int g_config_gsplus_update_needed;
|
||||
void
|
||||
iwm_vbl_update(int doit_3_persec)
|
||||
{
|
||||
|
|
@ -359,7 +359,7 @@ iwm_vbl_update(int doit_3_persec)
|
|||
g_temp_boot_slot = 254;
|
||||
g_bram_ptr[40] = g_orig_boot_slot;
|
||||
clk_calculate_bram_checksum();
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -376,7 +376,7 @@ iwm_vbl_update(int doit_3_persec)
|
|||
g_temp_boot_slot = 254;
|
||||
g_bram_ptr[40] = g_orig_boot_slot;
|
||||
clk_calculate_bram_checksum();
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1879,7 +1879,7 @@ iwm_nibblize_track_525(Disk *dsk, Trk *trk, byte *track_buf, int qtr_track)
|
|||
|
||||
|
||||
word_ptr = (word32 *)&(trk->nib_area[0]);
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
val = 0xff08ff08;
|
||||
#else
|
||||
val = 0x08ff08ff;
|
||||
|
|
@ -1984,7 +1984,7 @@ iwm_nibblize_track_35(Disk *dsk, Trk *trk, byte *track_buf, int qtr_track)
|
|||
int i;
|
||||
|
||||
word_ptr = (word32 *)&(trk->nib_area[0]);
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__)
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__)
|
||||
val = 0xff08ff08;
|
||||
#else
|
||||
val = 0x08ff08ff;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
GSport - an Apple //gs Emulator
|
||||
GSplus - an Apple //gs Emulator
|
||||
Copyright (C) 2016 - Dagen Brock
|
||||
|
||||
Copyright (C) 2010 - 2013 by GSport contributors
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ char *g_mac_argv[MAX_MAC_ARGS];
|
|||
|
||||
extern char g_argv0_path[];
|
||||
extern char *g_status_ptrs[MAX_STATUS_LINES];
|
||||
extern const char g_gsport_version_str[];
|
||||
extern const char g_gsplus_version_str[];
|
||||
|
||||
extern int g_warp_pointer;
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ x_show_alert(int is_fatal, const char *str)
|
|||
}
|
||||
okstrref = CFSTR("Click OK to continue");
|
||||
if(is_fatal) {
|
||||
okstrref = CFSTR("Click OK to exit GSport");
|
||||
okstrref = CFSTR("Click OK to exit GSplus");
|
||||
}
|
||||
CreateStandardAlert(kAlertStopAlert, cfstrref, okstrref,
|
||||
&alert_param, &alert);
|
||||
|
|
@ -183,13 +183,13 @@ show_simple_alert(char *str1, char *str2, char *str3, int num)
|
|||
{
|
||||
char buf[256];
|
||||
|
||||
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_strs[0] = gsplus_malloc_str(str1);
|
||||
g_fatal_log_strs[1] = gsplus_malloc_str(str2);
|
||||
g_fatal_log_strs[2] = gsplus_malloc_str(str3);
|
||||
g_fatal_log = 3;
|
||||
if(num != 0) {
|
||||
snprintf(buf, 250, ": %d", num);
|
||||
g_fatal_log_strs[g_fatal_log++] = gsport_malloc_str(buf);
|
||||
g_fatal_log_strs[g_fatal_log++] = gsplus_malloc_str(buf);
|
||||
}
|
||||
x_show_alert(0, 0);
|
||||
}
|
||||
|
|
@ -203,7 +203,7 @@ x_dialog_create_gsport_conf(const char *str)
|
|||
|
||||
ret = x_show_alert(1, str);
|
||||
if(ret) {
|
||||
config_write_config_gsport_file();
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -227,7 +227,7 @@ my_cmd_handler( EventHandlerCallRef handlerRef, EventRef event, void *userdata)
|
|||
osresult = noErr;
|
||||
break;
|
||||
case 'abou':
|
||||
show_simple_alert("GSport v", (char *)g_gsport_version_str,
|
||||
show_simple_alert("GSport v", (char *)g_gsplus_version_str,
|
||||
"\nCopyright 2010 - 2011 GSport Contributors\n"
|
||||
"Latest version at http://gsport.sourceforge.net/\n", 0);
|
||||
osresult = noErr;
|
||||
|
|
@ -295,16 +295,16 @@ dummy_event_handler(EventHandlerCallRef call_ref, EventRef in_event,
|
|||
OSStatus err;
|
||||
EventHandlerRef installed_handler;
|
||||
EventTypeSpec event_spec = { kEventClassApplication, kEventAppQuit };
|
||||
|
||||
|
||||
// From http://developer.apple.com/qa/qa2001/qa1061.html
|
||||
// Trick to move main event queue to use ReceiveNextEvent in an event
|
||||
// handler called by RunApplicationEventLoop
|
||||
|
||||
|
||||
err = InstallApplicationEventHandler(g_quit_handler_UPP, 1, &event_spec,
|
||||
NULL, &installed_handler);
|
||||
|
||||
gsportmain(g_mac_argc, g_mac_argv);
|
||||
|
||||
|
||||
gsplusmain(g_mac_argc, g_mac_argv);
|
||||
|
||||
return noErr;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include "tfe/protos_tfe.h"
|
||||
#endif
|
||||
|
||||
extern char const g_gsport_version_str[];
|
||||
extern char const g_gsplus_version_str[];
|
||||
|
||||
extern byte *g_memory_ptr;
|
||||
extern byte *g_dummy_memory1_ptr;
|
||||
|
|
@ -1384,8 +1384,8 @@ io_read(word32 loc, double *cyc_ptr)
|
|||
return 'G';
|
||||
case 2:
|
||||
g_em_emubyte_cnt = 0;
|
||||
tmp = g_gsport_version_str[0] - '0';
|
||||
i = g_gsport_version_str[2] - '0';
|
||||
tmp = g_gsplus_version_str[0] - '0';
|
||||
i = g_gsplus_version_str[2] - '0';
|
||||
return ((tmp & 0xf) << 4) + (i & 0xf);
|
||||
default:
|
||||
g_em_emubyte_cnt = 0;
|
||||
|
|
|
|||
12
src/protos.h
12
src/protos.h
|
|
@ -170,10 +170,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_gsport_file(void);
|
||||
void config_parse_config_gsplus_file(void);
|
||||
Disk *cfg_get_dsk_from_slot_drive(int slot, int drive);
|
||||
void config_generate_config_gsport_name(char *outstr, int maxlen, Disk *dsk, int with_extras);
|
||||
void config_write_config_gsport_file(void);
|
||||
void config_generate_config_gsplus_name(char *outstr, int maxlen, Disk *dsk, int with_extras);
|
||||
void config_write_config_gsplus_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);
|
||||
|
|
@ -409,11 +409,11 @@ void check_engine_asm_defines(void);
|
|||
byte *memalloc_align(int size, int skip_amt, void **alloc_ptr);
|
||||
void memory_ptr_init(void);
|
||||
void memory_ptr_shut(void); // OG Added shut
|
||||
int gsportmain(int argc, char **argv);
|
||||
int gsplusmain(int argc, char **argv);
|
||||
void load_roms_init_memory(void);
|
||||
void load_roms_shut_memory(void); // OG Added shut
|
||||
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 setup_gsplus_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);
|
||||
|
|
@ -450,7 +450,7 @@ int fatal_printf(const char *fmt, ...);
|
|||
int gsport_vprintf(const char *fmt, va_list ap);
|
||||
void must_write(int fd, char *bufptr, int len);
|
||||
void clear_fatal_logs(void);
|
||||
char *gsport_malloc_str(char *in_str);
|
||||
char *gsplus_malloc_str(char *in_str);
|
||||
|
||||
|
||||
/* smartport.c */
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ int g_appletalk_network_hint = 0;
|
|||
|
||||
extern Scc scc_stat[2];
|
||||
|
||||
extern int g_config_gsport_update_needed;
|
||||
extern int g_config_gsplus_update_needed;
|
||||
static bool bridge_initialized = false;
|
||||
|
||||
void scc_llap_init()
|
||||
|
|
@ -63,7 +63,7 @@ void scc_llap_update()
|
|||
if (g_appletalk_network_hint != atbridge_get_net())
|
||||
{
|
||||
g_appletalk_network_hint = atbridge_get_net();
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,7 @@
|
|||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
// This is an experimental video driver for the KEGS/GSport emulator.
|
||||
// It requires SDL2 libraries to build. I've tested on Mac, but should
|
||||
// be easy to port to other platforms. -DagenBrock
|
||||
|
||||
// @todo: mouse clip bugs.. great western shootout.
|
||||
// @todo: force refresh after screen mode change
|
||||
// @todo: mouse clip bugs.. great western shootout. Paint 8/16
|
||||
|
||||
#include "SDL.h"
|
||||
#include <stdbool.h>
|
||||
|
|
@ -63,6 +58,7 @@ extern word32 g_full_refresh_needed;
|
|||
extern word32 g_palette_8to1624[256];
|
||||
extern word32 g_a2palette_8to1624[256];
|
||||
extern Kimage g_mainwin_kimage;
|
||||
extern const char g_gsplus_version_str[]; // version string for title bar
|
||||
|
||||
SDL_Window *window; // Declare a pointer
|
||||
SDL_Renderer *renderer;
|
||||
|
|
@ -75,7 +71,6 @@ int handle_sdl_mouse_motion_event(SDL_Event event);
|
|||
|
||||
int g_num_a2_keycodes = 0;
|
||||
int a2_key_to_sdlkeycode[][3] = {
|
||||
{ 0x12, SDLK_1, 0},
|
||||
{ 0x35, SDLK_ESCAPE,0 },
|
||||
{ 0x7a, SDLK_F1, 0 },
|
||||
{ 0x78, SDLK_F2, 0 },
|
||||
|
|
@ -131,9 +126,9 @@ int a2_key_to_sdlkeycode[][3] = {
|
|||
{ 0x75, SDLK_DELETE, 0 },
|
||||
{ 0x77, SDLK_END, 0 },
|
||||
{ 0x79, SDLK_PAGEDOWN, 0 },
|
||||
{ 0x59, SDLK_KP_7, 0 },
|
||||
{ 0x5b, SDLK_KP_8, 0 },
|
||||
{ 0x5c, SDLK_KP_9, 0 },
|
||||
{ 0x59, SDLK_KP_7, SDLK_HOME },
|
||||
{ 0x5b, SDLK_KP_8, SDLK_UP },
|
||||
{ 0x5c, SDLK_KP_9, SDLK_PAGEUP },
|
||||
{ 0x4e, SDLK_KP_MINUS, 0 },
|
||||
{ 0x39, SDLK_CAPSLOCK, 0 },
|
||||
{ 0x00, 'a', 'A' },
|
||||
|
|
@ -166,7 +161,7 @@ int a2_key_to_sdlkeycode[][3] = {
|
|||
{ 0x3e, SDLK_UP, 0 },
|
||||
{ 0x53, SDLK_KP_1, 0 },
|
||||
{ 0x54, SDLK_KP_2, SDLK_DOWN },
|
||||
{ 0x55, SDLK_KP_3, 0 },
|
||||
{ 0x55, SDLK_KP_3, SDLK_PAGEDOWN },
|
||||
{ 0x36, SDLK_RCTRL, SDLK_LCTRL },
|
||||
{ 0x3a, SDLK_LALT, SDLK_RALT }, /* Option */
|
||||
{ 0x37, SDLK_LGUI, SDLK_RGUI }, /* Command */
|
||||
|
|
@ -183,10 +178,22 @@ int a2_key_to_sdlkeycode[][3] = {
|
|||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
return gsportmain(argc, argv);
|
||||
return gsplusmain(argc, argv);
|
||||
}
|
||||
|
||||
const char *byte_to_binary(int x)
|
||||
{
|
||||
static char b[9];
|
||||
b[0] = '\0';
|
||||
|
||||
int z;
|
||||
for (z = 128; z > 0; z >>= 1)
|
||||
{
|
||||
strcat(b, ((x & z) == z) ? "1" : "0");
|
||||
}
|
||||
|
||||
return b;
|
||||
}
|
||||
|
||||
/// Queries the Screen to see if it's set to Fullscreen or Not
|
||||
/// @return SDL_FALSE if windowed, SDL_TRUE if fullscreen
|
||||
|
|
@ -209,10 +216,7 @@ dev_video_init()
|
|||
g_num_a2_keycodes = 0;
|
||||
int i;
|
||||
int keycode;
|
||||
int tmp_array[0x80];
|
||||
for(i = 0; i <= 0x7f; i++) {
|
||||
tmp_array[i] = 0;
|
||||
}
|
||||
|
||||
for(i = 0; i < 0x7f; i++) {
|
||||
keycode = a2_key_to_sdlkeycode[i][0];
|
||||
if(keycode < 0) {
|
||||
|
|
@ -221,12 +225,6 @@ dev_video_init()
|
|||
} else if(keycode > 0x7f) {
|
||||
printf("a2_key_to_xsym[%d] = %02x!\n", i, keycode);
|
||||
exit(2);
|
||||
} else {
|
||||
if(tmp_array[keycode]) {
|
||||
printf("a2_key_to_x[%d] = %02x used by %d\n",
|
||||
i, keycode, tmp_array[keycode] - 1);
|
||||
}
|
||||
tmp_array[keycode] = i + 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -257,8 +255,10 @@ dev_video_init_sdl()
|
|||
SDL_Init(SDL_INIT_VIDEO); // Initialize SDL2
|
||||
|
||||
// Create an application window with the following settings:
|
||||
char window_title[50]; // @todo - unsafe assumption?
|
||||
sprintf(window_title, "GSplus v%-6s", g_gsplus_version_str),
|
||||
window = SDL_CreateWindow(
|
||||
"GSPLUS V.0", // window title
|
||||
window_title, // window title (GSport vX.X)
|
||||
SDL_WINDOWPOS_UNDEFINED, // initial x position
|
||||
SDL_WINDOWPOS_UNDEFINED, // initial y position
|
||||
BASE_WINDOW_WIDTH, // width, in pixels
|
||||
|
|
@ -278,7 +278,7 @@ dev_video_init_sdl()
|
|||
renderer = SDL_CreateRenderer(window, -1, 0);
|
||||
|
||||
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); // make the scaled rendering look smoother.
|
||||
// SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best"); // make the scaled rendering look smoother.
|
||||
// SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best"); // make the scaled rendering look smoother.
|
||||
SDL_RenderSetLogicalSize(renderer, BASE_WINDOW_WIDTH, X_A2_WINDOW_HEIGHT);
|
||||
|
||||
texture = SDL_CreateTexture(renderer,
|
||||
|
|
@ -478,7 +478,6 @@ handle_sdl_key_event(SDL_Event event)
|
|||
|
||||
kb_shift_control_state = state;
|
||||
|
||||
|
||||
is_up = 0;
|
||||
int a2code;
|
||||
if (event.type == SDL_KEYUP) {
|
||||
|
|
@ -533,7 +532,7 @@ void
|
|||
x_dialog_create_gsport_conf(const char *str)
|
||||
{
|
||||
// Just write the config file already...
|
||||
config_write_config_gsport_file();
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +1,46 @@
|
|||
/*
|
||||
GSPLUS - Advanced Apple IIGS Emulator Environment
|
||||
Copyright (C) 2016 - Dagen Brock
|
||||
|
||||
|
||||
Copyright (C) 2010 - 2014 by GSport contributors
|
||||
|
||||
|
||||
Based on the KEGS emulator written by and Copyright (C) 2003 Kent Dickey
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
This program is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include "defc.h"
|
||||
#ifdef HAVE_TFE
|
||||
#include "tfe/tfesupp.h"
|
||||
#include "tfe/protos_tfe.h"
|
||||
#endif
|
||||
#include "printer.h"
|
||||
#include "imagewriter.h"
|
||||
#include "printer.h"
|
||||
#include "imagewriter.h"
|
||||
|
||||
#ifdef UNDER_CE
|
||||
#define vsnprintf _vsnprintf
|
||||
#define vsnprintf _vsnprintf
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TFE
|
||||
#include "tfe/tfesupp.h"
|
||||
#include "tfe/protos_tfe.h"
|
||||
#endif
|
||||
|
||||
#if defined (_WIN32) || defined(__CYGWIN__)
|
||||
#define WIN32_LEAN_AND_MEAN /* Tell windows we want less header gunk */
|
||||
#define STRICT /* Tell Windows we want compile type checks */
|
||||
#include <windows.h> /* Need a definition for LPTSTR in CYGWIN */
|
||||
|
||||
extern void get_cwd(LPTSTR buffer, int size);
|
||||
#define WIN32_LEAN_AND_MEAN /* Tell windows we want less header gunk */
|
||||
#define STRICT /* Tell Windows we want compile type checks */
|
||||
#include <windows.h> /* Need a definition for LPTSTR in CYGWIN */
|
||||
extern void get_cwd(LPTSTR buffer, int size);
|
||||
#endif
|
||||
|
||||
#define PC_LOG_LEN (8*1024)
|
||||
|
|
@ -51,7 +51,7 @@ int g_accept_events = 0; // OG To know if the emulator is ready to accept extern
|
|||
|
||||
char g_argv0_path[256] = "./";
|
||||
|
||||
const char *g_gsport_default_paths[] = { "", "./", "${HOME}/","${PWD}/",
|
||||
const char *g_gsplus_default_paths[] = { "", "./", "${HOME}/","${PWD}/",
|
||||
#ifdef MAC
|
||||
"${0}/../",
|
||||
#endif
|
||||
|
|
@ -158,7 +158,7 @@ int g_imagewriter_paper = 0;
|
|||
int g_imagewriter_banner = 0;
|
||||
|
||||
int g_config_iwm_vbl_count = 0;
|
||||
extern const char g_gsport_version_str[] = "0.31";
|
||||
extern const char g_gsplus_version_str[] = "0.10a";
|
||||
int g_pause=0; // OG Added pause
|
||||
|
||||
#define START_DCYCS (0.0)
|
||||
|
|
@ -259,7 +259,7 @@ void sim65816_initglobals()
|
|||
|
||||
g_config_iwm_vbl_count = 0;
|
||||
|
||||
g_pause=0;
|
||||
g_pause=0;
|
||||
|
||||
g_last_vbl_dcycs = START_DCYCS;
|
||||
g_cur_dcycs = START_DCYCS;
|
||||
|
|
@ -696,7 +696,7 @@ show_regs_act(Engine_reg *eptr)
|
|||
int kpc;
|
||||
int direct_page, dbank;
|
||||
int stack;
|
||||
|
||||
|
||||
kpc = eptr->kpc;
|
||||
tmp_acc = eptr->acc;
|
||||
direct_page = eptr->direct;
|
||||
|
|
@ -724,7 +724,7 @@ show_regs()
|
|||
|
||||
void quitEmulator()
|
||||
{
|
||||
printf("set_halt(HALT_WANTTOQUIT)\n");
|
||||
printf("set_halt(HALT_WANTTOQUIT)\n");
|
||||
set_halt(HALT_WANTTOQUIT);
|
||||
}
|
||||
|
||||
|
|
@ -788,7 +788,7 @@ do_reset()
|
|||
|
||||
g_stepping = 0;
|
||||
|
||||
if (g_irq_pending)
|
||||
if (g_irq_pending)
|
||||
halt_printf("*** irq remainings...\n");
|
||||
|
||||
}
|
||||
|
|
@ -853,7 +853,7 @@ memalloc_align(int size, int skip_amt, void **alloc_ptr)
|
|||
word32 offset;
|
||||
|
||||
skip_amt = MAX(256, skip_amt);
|
||||
bptr = (byte*)calloc(size + skip_amt + 256, 1); // OG Added cast
|
||||
bptr = (byte*)calloc(size + skip_amt + 256, 1); // OG Added cast
|
||||
if(alloc_ptr) {
|
||||
/* Save allocation address */
|
||||
*alloc_ptr = bptr;
|
||||
|
|
@ -897,7 +897,7 @@ memory_ptr_init()
|
|||
void
|
||||
memory_ptr_shut()
|
||||
{
|
||||
if(g_memory_alloc_ptr)
|
||||
if(g_memory_alloc_ptr)
|
||||
{
|
||||
free(g_memory_alloc_ptr);
|
||||
g_memory_alloc_ptr = 0;
|
||||
|
|
@ -917,7 +917,7 @@ int g_screen_depth = 8;
|
|||
|
||||
|
||||
int
|
||||
gsportmain(int argc, char **argv)
|
||||
gsplusmain(int argc, char **argv)
|
||||
{
|
||||
int diff;
|
||||
int skip_amt;
|
||||
|
|
@ -1139,7 +1139,7 @@ gsportmain(int argc, char **argv)
|
|||
// OG Notify emulator has been initialized and ready to accept external events
|
||||
g_initialized = 1;
|
||||
g_accept_events = 1;
|
||||
|
||||
|
||||
do_go();
|
||||
|
||||
/* If we get here, we hit a breakpoint, call debug intfc */
|
||||
|
|
@ -1150,7 +1150,7 @@ gsportmain(int argc, char **argv)
|
|||
|
||||
sound_shutdown();
|
||||
|
||||
|
||||
|
||||
// OG Cleaning up
|
||||
adb_shut();
|
||||
iwm_shut();
|
||||
|
|
@ -1267,7 +1267,7 @@ gsport_expand_path(char *out_ptr, const char *in_ptr, int maxlen)
|
|||
}
|
||||
|
||||
void
|
||||
setup_gsport_file(char *outname, int maxlen, int ok_if_missing,
|
||||
setup_gsplus_file(char *outname, int maxlen, int ok_if_missing,
|
||||
int can_create_file, const char **name_ptr)
|
||||
{
|
||||
char local_path[256];
|
||||
|
|
@ -1278,7 +1278,7 @@ setup_gsport_file(char *outname, int maxlen, int ok_if_missing,
|
|||
|
||||
outname[0] = 0;
|
||||
|
||||
path_ptr = &g_gsport_default_paths[0];
|
||||
path_ptr = &g_gsplus_default_paths[0];
|
||||
|
||||
save_path_ptr = path_ptr;
|
||||
while(*path_ptr) {
|
||||
|
|
@ -1328,7 +1328,7 @@ setup_gsport_file(char *outname, int maxlen, int ok_if_missing,
|
|||
|
||||
// But clear out the fatal_printfs first
|
||||
clear_fatal_logs();
|
||||
setup_gsport_file(outname, maxlen, ok_if_missing,
|
||||
setup_gsplus_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.
|
||||
|
|
@ -1714,7 +1714,7 @@ run_prog()
|
|||
((zip_speed_0tof != 0) || (limit_speed == 3) ||
|
||||
(g_zipgs_unlock >= 4) );
|
||||
|
||||
// OG unlimited speed should not be affected by zip.
|
||||
// OG unlimited speed should not be affected by zip.
|
||||
// unl_speed = faster_than_28 && !zip_speed;
|
||||
unl_speed = (limit_speed == 0) && faster_than_28;
|
||||
|
||||
|
|
@ -2128,7 +2128,7 @@ update_60hz(double dcycs, double dtime_now)
|
|||
}
|
||||
|
||||
// OG Pass speed info to the control (ActiveX specific)
|
||||
#ifdef ACTIVEGS
|
||||
#ifdef ACTIVEGS
|
||||
{
|
||||
extern void updateInfo(const char* target,const char *speed);
|
||||
updateInfo(sp_str,total_mhz_ptr);
|
||||
|
|
@ -2203,9 +2203,9 @@ update_60hz(double dcycs, double dtime_now)
|
|||
|
||||
draw_iwm_status(5, status_buf);
|
||||
|
||||
sprintf(status_buf, "GSport v%-6s "
|
||||
sprintf(status_buf, "GSplus v%-6s "
|
||||
"Press F4 for Config Menu %s",
|
||||
g_gsport_version_str, code_str2);
|
||||
g_gsplus_version_str, code_str2);
|
||||
video_update_status_line(6, status_buf);
|
||||
|
||||
g_status_refresh_needed = 1;
|
||||
|
|
@ -2456,7 +2456,7 @@ check_scan_line_int(double dcycs, int cur_video_line)
|
|||
cur_video_line);
|
||||
start = 0;
|
||||
}
|
||||
|
||||
|
||||
for(line = start; line < 200; line++) {
|
||||
i = line;
|
||||
|
||||
|
|
@ -2481,7 +2481,7 @@ void
|
|||
check_for_new_scan_int(double dcycs)
|
||||
{
|
||||
int cur_video_line;
|
||||
|
||||
|
||||
cur_video_line = get_lines_since_vbl(dcycs) >> 8;
|
||||
|
||||
check_scan_line_int(dcycs, cur_video_line);
|
||||
|
|
@ -2736,7 +2736,7 @@ clear_fatal_logs()
|
|||
}
|
||||
|
||||
char *
|
||||
gsport_malloc_str(char *in_str)
|
||||
gsplus_malloc_str(char *in_str)
|
||||
{
|
||||
char *str;
|
||||
int len;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
val = (val2 << 16) + val1;
|
||||
#else
|
||||
val = (val1 << 24) + ((val1 << 8) & 0xff0000) +
|
||||
|
|
@ -763,7 +763,7 @@ extern byte g_bram[2][256];
|
|||
extern byte* g_bram_ptr;
|
||||
extern byte g_temp_boot_slot;
|
||||
extern byte g_orig_boot_slot;
|
||||
extern int g_config_gsport_update_needed;
|
||||
extern int g_config_gsplus_update_needed;
|
||||
void
|
||||
do_c700(word32 ret)
|
||||
{
|
||||
|
|
@ -773,7 +773,7 @@ do_c700(word32 ret)
|
|||
g_temp_boot_slot = 254;
|
||||
g_bram_ptr[40] = g_orig_boot_slot;
|
||||
clk_calculate_bram_checksum();
|
||||
g_config_gsport_update_needed = 1;
|
||||
g_config_gsplus_update_needed = 1;
|
||||
}
|
||||
ret = do_read_c7(0, 0x800, 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -1078,7 +1078,7 @@ sound_play(double dsamps)
|
|||
#if defined(__linux__) || defined(OSS)
|
||||
/* Linux seems to expect little-endian */
|
||||
/* samples always, even on PowerPC */
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
sndptr[pos] = (val << 16) + (val0 & 0xffff);
|
||||
# else
|
||||
sndptr[pos] = ((val & 0xff) << 24) +
|
||||
|
|
@ -1087,7 +1087,7 @@ sound_play(double dsamps)
|
|||
((val0 >> 8) & 0xff);
|
||||
# endif
|
||||
#else
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
sndptr[pos] = (val << 16) + (val0 & 0xffff);
|
||||
# else
|
||||
sndptr[pos] = (val0 << 16) + (val & 0xffff);
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ child_sound_init_linux()
|
|||
exit(1);
|
||||
}
|
||||
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
fmt = AFMT_S16_LE;
|
||||
#else
|
||||
fmt = AFMT_S16_BE;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan,
|
|||
(pal << 4);
|
||||
|
||||
if(mode_640 && !use_a2vid_palette) {
|
||||
#ifdef GSPORT_LITTLE_ENDIAN
|
||||
#ifdef GSPLUS_LITTLE_ENDIAN
|
||||
pal_word += 0x04000c08;
|
||||
#else
|
||||
pal_word += 0x080c0004;
|
||||
|
|
@ -118,7 +118,7 @@ SUPER_TYPE(byte *screen_data, int pixels_per_line, int y, int scan,
|
|||
pix3 = palptr[pix3+4];
|
||||
}
|
||||
#if SUPER_PIXEL_SIZE == 8
|
||||
# ifdef GSPORT_LITTLE_ENDIAN
|
||||
# ifdef GSPLUS_LITTLE_ENDIAN
|
||||
tmp = (pix3 << 24) + (pix2 << 16) +
|
||||
(pix1 << 8) + pix0 + pal_word;
|
||||
# else
|
||||
|
|
@ -127,7 +127,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 GSPORT_LITTLE_ENDIAN
|
||||
# ifdef GSPLUS_LITTLE_ENDIAN
|
||||
tmp = (pix1 << 16) + pix0;
|
||||
tmp2 = (pix3 << 16) + pix2;
|
||||
# else
|
||||
|
|
@ -189,7 +189,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 GSPORT_LITTLE_ENDIAN
|
||||
# ifdef GSPLUS_LITTLE_ENDIAN
|
||||
tmp = (pix1 << 24) + (pix1 << 16) +
|
||||
(pix0 << 8) + pix0 + pal_word;
|
||||
# else
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
TARGET = gsport.exe
|
||||
OBJECTS = $(OBJECTS1) win32snd_driver.o windriver.o gsport32.o
|
||||
CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN
|
||||
CCOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX = ".exe"
|
||||
NAME = gsport
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) sdl2_driver.o sdl2snd_driver
|
|||
ARCHS = ppc, i386, ppc64, x86_64
|
||||
|
||||
# OPTIONS FOR COMPILING C SOURCE
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2
|
||||
# OPTIONS FOR COMPILING C++ SOURCE
|
||||
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
|
||||
|
||||
EXTRA_LIBS = -lSDL2 -lfreetype
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
LDFLAGS = `sdl2-config --static-libs` -L/usr/local/lib
|
||||
LDOPTS = -I.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ AS = cc
|
|||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -L/usr/X11/lib
|
||||
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ TARGET = gsportx
|
|||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
||||
CC = gcc
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DHAVE_ATBRIDGE
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DHAVE_ATBRIDGE
|
||||
SUFFIX =
|
||||
NAME = gsportx
|
||||
LDFLAGS =
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ TARGET = gsplusfb
|
|||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) fbdriver.o
|
||||
CC = gcc
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_ATBRIDGE
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_ATBRIDGE
|
||||
SUFFIX =
|
||||
NAME = gsportfb
|
||||
LDFLAGS =
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
TARGET = gsplus.exe
|
||||
|
||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o gsport32.o
|
||||
CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE
|
||||
CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE
|
||||
CCOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE
|
||||
CPPOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE
|
||||
|
||||
SUFFIX = ".exe"
|
||||
NAME = gsplus
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
TARGET = gsport.exe
|
||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o gsport32.o
|
||||
CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DHAVE_SDL -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE
|
||||
CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE -I /usr/include/freetype2 -I/usr/include/SDL
|
||||
CCOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DHAVE_SDL -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE
|
||||
CPPOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE -I /usr/include/freetype2 -I/usr/include/SDL
|
||||
|
||||
SUFFIX = ".exe"
|
||||
NAME = gsport
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ AS = cc
|
|||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o sdl2snd_driver.o
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL2 -I/usr/include/freetype2
|
||||
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/inclu
|
|||
|
||||
|
||||
EXTRA_LIBS = -lfreetype -lSDL2 -ldl -lm -lstdc++
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
LDFLAGS =
|
||||
LDOPTS = -I.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
|||
#-march=i686 is causing "error: CPU you selected does not support x86-64 instruction set" on ubuntu
|
||||
#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=i686 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
OPTS = -DGSPLUS_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ TARGET = gsportx
|
|||
OBJECTS = $(OBJECTS1) xdriver.o
|
||||
CC = gcc
|
||||
CCOPTS = -O
|
||||
OPTS = -DNDEBUG -DSOLARIS -DGSPORT_LITTLE_ENDIAN -DSOLARISSOUND
|
||||
OPTS = -DNDEBUG -DSOLARIS -DGSPLUS_LITTLE_ENDIAN -DSOLARISSOUND
|
||||
SUFFIX =
|
||||
NAME = gsportx
|
||||
LDFLAGS =
|
||||
|
|
|
|||
|
|
@ -534,7 +534,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];
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
val = (val3 << 24) + (val2 << 16) + (val1 << 8) + val0;
|
||||
#else
|
||||
val = (val0 << 24) + (val1 << 16) + (val2 << 8) + val3;
|
||||
|
|
@ -1640,7 +1640,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;
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
val01_wd = (val1_wd << 16) + (val0_wd & 0xffff);
|
||||
#else
|
||||
val01_wd = (val0_wd << 16) + (val1_wd & 0xffff);
|
||||
|
|
@ -1780,7 +1780,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;
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
val01_wd = (val1_wd << 24) + (val0_wd&0xffffff);
|
||||
val12_wd = (val2_wd << 16) + (val1_wd & 0xffff);
|
||||
val23_wd = (val3_wd << 8) + (val2_wd & 0xff);
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ void
|
|||
x_dialog_create_gsport_conf(const char *str)
|
||||
{
|
||||
// Just write the config file already...
|
||||
config_write_config_gsport_file();
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -181,7 +181,7 @@ main(int argc, char **argv)
|
|||
|
||||
|
||||
gsportinit(hwnd);
|
||||
int ret = gsportmain(argc, argv);
|
||||
int ret = gsplusmain(argc, argv);
|
||||
|
||||
UnregisterClass(wndclass.lpszClassName,GetModuleHandle(NULL));
|
||||
|
||||
|
|
|
|||
|
|
@ -258,14 +258,14 @@ int a2_key_to_xsym[][3] = {
|
|||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
return gsportmain(argc, argv);
|
||||
return gsplusmain(argc, argv);
|
||||
}
|
||||
|
||||
void
|
||||
x_dialog_create_gsport_conf(const char *str)
|
||||
{
|
||||
// Just write the config file already...
|
||||
config_write_config_gsport_file();
|
||||
config_write_config_gsplus_file();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -905,7 +905,7 @@ get_ximage(Kimage *kimage_ptr)
|
|||
xim = XCreateImage(g_display, g_vis, depth, ZPixmap, 0,
|
||||
(char *)ptr, width, height, 8, 0);
|
||||
|
||||
#if defined(GSPORT_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
#if defined(GSPLUS_LITTLE_ENDIAN) || defined (__LITTLE_ENDIAN__) // OSX needs to calculate endianness mid-compilation, can't be passed on compile command
|
||||
xim->byte_order = LSBFirst;
|
||||
#else
|
||||
xim->byte_order = MSBFirst;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user