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

Switch kbc to device_t kbd_device

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-07 18:08:11 -05:00
parent fea5ac681b
commit 118ab005f0
3 changed files with 342 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,6 @@ typedef struct {
#define RSHIFT_OFF 0x105 #define RSHIFT_OFF 0x105
/* KBC #define's */ /* KBC #define's */
#define KBC_UNKNOWN 0x0000 /* As yet unknown keyboard */
/* IBM-style controllers */ /* IBM-style controllers */
#define KBC_IBM_PC_XT 0x0000 /* IBM PC/XT */ #define KBC_IBM_PC_XT 0x0000 /* IBM PC/XT */
#define KBC_IBM_PCJR 0x0001 /* IBM PCjr */ #define KBC_IBM_PCJR 0x0001 /* IBM PCjr */

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

@@ -288,7 +288,11 @@ typedef struct _machine_ {
const machine_memory_t ram; const machine_memory_t ram;
int ram_granularity; int ram_granularity;
int nvrmask; int nvrmask;
uint16_t kbc; #ifdef EMU_DEVICE_H
const device_t *kbc_device;
#else
void *kbc_device;
#endif /* EMU_DEVICE_H */
/* Bits: /* Bits:
7-0 Set bits are forced set on P1 (no forced set = 0x00); 7-0 Set bits are forced set on P1 (no forced set = 0x00);
15-8 Clear bits are forced clear on P1 (no foced clear = 0xff). */ 15-8 Clear bits are forced clear on P1 (no foced clear = 0xff). */
@@ -324,6 +328,7 @@ extern char *machine_get_internal_name(void);
extern int machine_get_machine_from_internal_name(char *s); extern int machine_get_machine_from_internal_name(char *s);
extern void machine_init(void); extern void machine_init(void);
#ifdef EMU_DEVICE_H #ifdef EMU_DEVICE_H
extern const device_t *machine_get_kbc_device(int m);
extern const device_t *machine_get_device(int m); extern const device_t *machine_get_device(int m);
extern const device_t *machine_get_vid_device(int m); extern const device_t *machine_get_vid_device(int m);
extern const device_t *machine_get_snd_device(int m); extern const device_t *machine_get_snd_device(int m);

662
src/machine/machine_table.c
View File

File diff suppressed because it is too large Load Diff