mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2021-09-17 02:48:18 +02:00
parent b0367133d6 c35b7e21ba
commit 2bc9e7520a
13 changed files with 150 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ extern void fdc_set_base(fdc_t *fdc, int base);
extern void fdc_set_irq(fdc_t *fdc, int irq);
extern void fdc_set_dma_ch(fdc_t *fdc, int dma_ch);
extern int fdc_getdata(fdc_t *fdc, int last);
extern int fdc_data(fdc_t *fdc, uint8_t data);
extern int fdc_data(fdc_t *fdc, uint8_t data, int last);
extern void fdc_sectorid(fdc_t *fdc, uint8_t track, uint8_t side,
uint8_t sector, uint8_t size, uint8_t crc1,