claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the AMD K5 and K6 CPU's and the ATi VGA Wonder XL24 to the Dev branch;

Browse Source 
Turned the char arrays in gameport.h into const char pointers;
The makefile no longer links in the (unfinished) PIIX4 emulation code (which is currently not used by anything even in the Dev branch).
This commit is contained in:
OBattler
2018-02-18 13:43:49 +01:00
parent e0a9de85c9
commit 1405d9b10b
13 changed files with 120 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/gameport.c
View File

@@ -54,7 +54,7 @@ char *joystick_get_name(int64_t joystick)
{
if (!joystick_list[joystick])
return NULL;
return joystick_list[joystick]->name;
return (char *) joystick_list[joystick]->name;
}
int64_t joystick_get_max_joysticks(int64_t joystick)
@@ -79,17 +79,17 @@ int64_t joystick_get_pov_count(int64_t joystick)
char *joystick_get_axis_name(int64_t joystick, int64_t id)
{
return joystick_list[joystick]->axis_names[id];
return (char *) joystick_list[joystick]->axis_names[id];
}
char *joystick_get_button_name(int64_t joystick, int64_t id)
{
return joystick_list[joystick]->button_names[id];
return (char *) joystick_list[joystick]->button_names[id];
}
char *joystick_get_pov_name(int64_t joystick, int64_t id)
{
return joystick_list[joystick]->pov_names[id];
return (char *) joystick_list[joystick]->pov_names[id];
}
typedef struct gameport_axis_t

8
src/game/gameport.h
View File

@@ -10,7 +10,7 @@
typedef struct
{
char name[80];
const char *name;
void *(*init)(void);
void (*close)(void *p);
uint8_t (*read)(void *p);
@@ -19,9 +19,9 @@ typedef struct
void (*a0_over)(void *p);
int axis_count, button_count, pov_count;
int max_joysticks;
char axis_names[8][32];
char button_names[32][32];
char pov_names[4][32];
const char *axis_names[8];
const char *button_names[32];
const char *pov_names[4];
} joystick_if_t;