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

Merged all the latest and missed 86box commits.

Browse Source 
Finally fixed the configuration UI of the FDC's.
This commit is contained in:
TC1995
2020-06-17 14:29:24 +02:00
parent 90d1ddac52
commit b97b9ae2f9
12 changed files with 183 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/86box/fdc_ext.h
View File

@@ -30,14 +30,13 @@ extern int fdc_type;
extern const device_t fdc_pii151b_device;
extern const device_t fdc_pii158b_device;
extern void fdc_ext_reset(void);
extern void fdc_card_init(void);
extern char *fdc_ext_get_name(int fdc_ext);
extern char *fdc_ext_get_internal_name(int fdc_ext);
extern int fdc_ext_get_id(char *s);
extern int fdc_ext_get_from_internal_name(char *s);
extern const device_t *fdc_ext_get_device(int fdc_ext);
extern int fdc_ext_has_config(int fdc_ext);
extern int fdc_ext_available(int fdc_ext);
extern char *fdc_card_getname(int card);
extern char *fdc_card_get_internal_name(int card);
extern int fdc_card_get_from_internal_name(char *s);
extern const device_t *fdc_card_getdevice(int card);
extern int fdc_card_has_config(int card);
extern int fdc_card_available(int card);
#endif /*EMU_FDC_H*/

3
src/include/86box/language.h
View File

@@ -91,6 +91,7 @@
#define IDS_2115 2115 // "MO %i (%03i): %ls"
#define IDS_2116 2116 // "MO images (*.IM?)\0*.IM..."
#define IDS_2117 2117 // "Welcome to 86Box!"
#define IDS_2118 2118 // "Internal controller"
#define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i"
@@ -169,7 +170,7 @@
#define IDS_LANG_ENUS IDS_7168
#define STR_NUM_2048 70
#define STR_NUM_2048 71
#define STR_NUM_3072 11
#define STR_NUM_4096 18
#define STR_NUM_4352 7

4
src/include/86box/resource.h
View File

@@ -181,8 +181,8 @@
#define IDC_CHECK_POSTCARD 1130
#define IDC_COMBO_ISARTC 1131
#define IDC_CONFIGURE_ISARTC 1132
#define IDC_COMBO_FDC_EXT 1133
#define IDC_CONFIGURE_FDC_EXT 1134
#define IDC_COMBO_FDC 1133
#define IDC_CONFIGURE_FDC 1134
#define IDC_GROUP_ISAMEM 1140
#define IDC_COMBO_ISAMEM_1 1141
#define IDC_COMBO_ISAMEM_2 1142