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

PS/55: Fix some warnings and compile-breaking errors.

Browse Source
This commit is contained in:
OBattler
2025-02-19 11:21:50 +01:00
parent e386660839
commit c7d9b4c5e7
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device/keyboard.c
View File

@@ -85,6 +85,8 @@ typedef struct {
const uint8_t brk[4]; const uint8_t brk[4];
} scconvtbl; } scconvtbl;
/* Is this a left-over of something planned earlier? */
#ifdef USE_SCCONV55_82
static scconvtbl scconv55_82[18 + 1] = static scconvtbl scconv55_82[18 + 1] =
{ {
// clang-format off // clang-format off
@@ -109,6 +111,7 @@ static scconvtbl scconv55_82[18 + 1] =
{.sc = 0 , .mk = { 0 }, .brk = { 0 } } /* end */ {.sc = 0 , .mk = { 0 }, .brk = { 0 } } /* end */
// clang-format on // clang-format on
}; };
#endif
static scconvtbl scconv55_8a[18 + 1] = static scconvtbl scconv55_8a[18 + 1] =
{ {

2
src/include/86box/machine.h
View File

@@ -903,7 +903,7 @@ extern int machine_ps2_model_70_type3_init(const machine_t *);
extern int machine_ps2_model_80_init(const machine_t *); extern int machine_ps2_model_80_init(const machine_t *);
extern int machine_ps2_model_80_axx_init(const machine_t *); extern int machine_ps2_model_80_axx_init(const machine_t *);
extern int machine_ps2_model_70_type4_init(const machine_t *); extern int machine_ps2_model_70_type4_init(const machine_t *);
extern int machine_ps55_model_50t_init(const machine_t*);; extern int machine_ps55_model_50t_init(const machine_t*);
extern int machine_ps55_model_50v_init(const machine_t*); extern int machine_ps55_model_50v_init(const machine_t*);
/* m_tandy.c */ /* m_tandy.c */

8
src/video/vid_ps55da2.c
View File

@@ -1256,8 +1256,8 @@ da2_out(uint16_t addr, uint16_t val, void *p)
uint16_t uint16_t
da2_in(uint16_t addr, void *p) da2_in(uint16_t addr, void *p)
{ {
da2_t *da2 = (da2_t *) p; da2_t *da2 = (da2_t *) p;
uint16_t temp; uint16_t temp = 0xff;
switch (addr) { switch (addr) {
case 0x3c3: case 0x3c3:
@@ -3020,7 +3020,7 @@ da2_reset(void *priv)
} }
static void * static void *
da2_init() da2_init(UNUSED(const device_t *info))
{ {
if (svga_get_pri() == NULL) if (svga_get_pri() == NULL)
return NULL; return NULL;
@@ -3083,7 +3083,7 @@ da2_init()
return da2; return da2;
} }
static int static int
da2_available() da2_available(void)
{ {
return (rom_present(DA2_FONTROM_PATH_HANT) || rom_present(DA2_FONTROM_PATH_JPAN)); return (rom_present(DA2_FONTROM_PATH_HANT) || rom_present(DA2_FONTROM_PATH_JPAN));
} }