diff --git a/src/device/keyboard.c b/src/device/keyboard.c index de97592bf..2b851f36c 100644 --- a/src/device/keyboard.c +++ b/src/device/keyboard.c @@ -85,6 +85,8 @@ typedef struct { const uint8_t brk[4]; } scconvtbl; +/* Is this a left-over of something planned earlier? */ +#ifdef USE_SCCONV55_82 static scconvtbl scconv55_82[18 + 1] = { // clang-format off @@ -109,6 +111,7 @@ static scconvtbl scconv55_82[18 + 1] = {.sc = 0 , .mk = { 0 }, .brk = { 0 } } /* end */ // clang-format on }; +#endif static scconvtbl scconv55_8a[18 + 1] = { diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 690d867db..78f4902eb 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -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_axx_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*); /* m_tandy.c */ diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c index ad27c978c..aaf5d4803 100644 --- a/src/video/vid_ps55da2.c +++ b/src/video/vid_ps55da2.c @@ -1256,8 +1256,8 @@ da2_out(uint16_t addr, uint16_t val, void *p) uint16_t da2_in(uint16_t addr, void *p) { - da2_t *da2 = (da2_t *) p; - uint16_t temp; + da2_t *da2 = (da2_t *) p; + uint16_t temp = 0xff; switch (addr) { case 0x3c3: @@ -3020,7 +3020,7 @@ da2_reset(void *priv) } static void * -da2_init() +da2_init(UNUSED(const device_t *info)) { if (svga_get_pri() == NULL) return NULL; @@ -3083,7 +3083,7 @@ da2_init() return da2; } static int -da2_available() +da2_available(void) { return (rom_present(DA2_FONTROM_PATH_HANT) || rom_present(DA2_FONTROM_PATH_JPAN)); }