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

Merge branch 'master' of https://github.com/OBattler/86Box

Browse Source
This commit is contained in:
OBattler
2017-10-16 17:33:29 +02:00
parent e10d751ca3 3572f7a34d
commit 86c439c14b
12 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bugger.h
View File

@@ -15,9 +15,10 @@
* *
* Definitions for the BUGGER card. * Definitions for the BUGGER card.
* *
* Version: @(#)bugger.h 1.0.3 2017/04/07 * Version: @(#)bugger.h 1.0.4 2017/10/15
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 1989-2017 Fred N. van Kempen. * Copyright 1989-2017 Fred N. van Kempen.
*/ */
#ifndef BUGGER_H #ifndef BUGGER_H
@@ -29,9 +30,17 @@
#define BUGGER_ADDRLEN 4 #define BUGGER_ADDRLEN 4
#ifdef __cplusplus
extern "C" {
#endif
/* Functions. */ /* Functions. */
extern void bugger_init(void); extern void bugger_init(void);
extern void bugger_remove(void); extern void bugger_remove(void);
#ifdef __cplusplus
}
#endif
#endif /*BUGGER_H*/ #endif /*BUGGER_H*/

4
src/cdrom/cdrom.c
View File

@@ -9,7 +9,7 @@
* Implementation of the CD-ROM drive with SCSI(-like) * Implementation of the CD-ROM drive with SCSI(-like)
* commands, for both ATAPI and SCSI usage. * commands, for both ATAPI and SCSI usage.
* *
* Version: @(#)cdrom.c 1.0.17 2017/10/14 * Version: @(#)cdrom.c 1.0.18 2017/10/15
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -51,6 +51,8 @@
#define MCR_ERR 0x08 /* Media change request */ #define MCR_ERR 0x08 /* Media change request */
cdrom_t cdrom[CDROM_NUM]; cdrom_t cdrom[CDROM_NUM];
cdrom_image_t cdrom_image[CDROM_NUM];
cdrom_ioctl_t cdrom_ioctl[CDROM_NUM];
cdrom_drive_t cdrom_drives[CDROM_NUM]; cdrom_drive_t cdrom_drives[CDROM_NUM];
uint8_t atapi_cdrom_drives[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; uint8_t atapi_cdrom_drives[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
uint8_t scsi_cdrom_drives[16][8] = { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, uint8_t scsi_cdrom_drives[16][8] = { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },

37
src/cdrom/cdrom.h
View File

@@ -9,7 +9,7 @@
* Implementation of the CD-ROM drive with SCSI(-like) * Implementation of the CD-ROM drive with SCSI(-like)
* commands, for both ATAPI and SCSI usage. * commands, for both ATAPI and SCSI usage.
* *
* Version: @(#)cdrom.h 1.0.2 2017/10/12 * Version: @(#)cdrom.h 1.0.3 2017/10/15
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -198,8 +198,19 @@ extern cdrom_t cdrom[CDROM_NUM];
extern cdrom_drive_t cdrom_drives[CDROM_NUM]; extern cdrom_drive_t cdrom_drives[CDROM_NUM];
extern uint8_t atapi_cdrom_drives[8]; extern uint8_t atapi_cdrom_drives[8];
extern uint8_t scsi_cdrom_drives[16][8]; extern uint8_t scsi_cdrom_drives[16][8];
cdrom_image_t cdrom_image[CDROM_NUM]; extern cdrom_image_t cdrom_image[CDROM_NUM];
cdrom_ioctl_t cdrom_ioctl[CDROM_NUM]; extern cdrom_ioctl_t cdrom_ioctl[CDROM_NUM];
#define cdrom_sense_error cdrom[id].sense[0]
#define cdrom_sense_key cdrom[id].sense[2]
#define cdrom_asc cdrom[id].sense[12]
#define cdrom_ascq cdrom[id].sense[13]
#define cdrom_drive cdrom_drives[id].host_drive
#ifdef __cplusplus
extern "C" {
#endif
extern int (*ide_bus_master_read)(int channel, uint8_t *data, int transfer_length); extern int (*ide_bus_master_read)(int channel, uint8_t *data, int transfer_length);
extern int (*ide_bus_master_write)(int channel, uint8_t *data, int transfer_length); extern int (*ide_bus_master_write)(int channel, uint8_t *data, int transfer_length);
@@ -217,15 +228,7 @@ extern void cdrom_phase_callback(uint8_t id);
extern uint32_t cdrom_read(uint8_t channel, int length); extern uint32_t cdrom_read(uint8_t channel, int length);
extern void cdrom_write(uint8_t channel, uint32_t val, int length); extern void cdrom_write(uint8_t channel, uint32_t val, int length);
#ifdef __cplusplus extern int cdrom_lba_to_msf_accurate(int lba);
extern "C" {
#endif
int cdrom_lba_to_msf_accurate(int lba);
#ifdef __cplusplus
}
#endif
extern void cdrom_close(uint8_t id); extern void cdrom_close(uint8_t id);
extern void cdrom_reset(uint8_t id); extern void cdrom_reset(uint8_t id);
@@ -237,15 +240,13 @@ extern void cdrom_insert(uint8_t id);
extern int find_cdrom_for_scsi_id(uint8_t scsi_id, uint8_t scsi_lun); extern int find_cdrom_for_scsi_id(uint8_t scsi_id, uint8_t scsi_lun);
extern int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len); extern int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len);
#define cdrom_sense_error cdrom[id].sense[0]
#define cdrom_sense_key cdrom[id].sense[2]
#define cdrom_asc cdrom[id].sense[12]
#define cdrom_ascq cdrom[id].sense[13]
#define cdrom_drive cdrom_drives[id].host_drive
extern void cdrom_global_init(void); extern void cdrom_global_init(void);
extern void cdrom_global_reset(void); extern void cdrom_global_reset(void);
extern void cdrom_hard_reset(void); extern void cdrom_hard_reset(void);
#ifdef __cplusplus
}
#endif
#endif /*EMU_CDROM_H*/ #endif /*EMU_CDROM_H*/

4
src/cdrom/cdrom_image.cc
View File

@@ -42,6 +42,10 @@ int cdrom_image_do_log = 0;
CDROM_Interface_Image* cdimg[CDROM_NUM] = { NULL, NULL, NULL, NULL }; CDROM_Interface_Image* cdimg[CDROM_NUM] = { NULL, NULL, NULL, NULL };
extern "C" void pclog(const char *fmt, ...);
void cdrom_image_log(const char *format, ...) void cdrom_image_log(const char *format, ...)
{ {
#ifdef ENABLE_CDROM_IMAGE_LOG #ifdef ENABLE_CDROM_IMAGE_LOG

2
src/cdrom/cdrom_image.h
View File

@@ -19,8 +19,6 @@ extern void image_close(uint8_t id);
void update_status_bar_icon_state(int tag, int state); void update_status_bar_icon_state(int tag, int state);
extern void cdrom_set_null_handler(uint8_t id); extern void cdrom_set_null_handler(uint8_t id);
void pclog(const char *format, ...);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

11
src/device.h
View File

@@ -9,11 +9,12 @@
* Implementation of the generic device interface to handle * Implementation of the generic device interface to handle
* all devices attached to the emulator. * all devices attached to the emulator.
* *
* Version: @(#)device.h 1.0.3 2017/10/04 * Version: @(#)device.h 1.0.4 2017/10/15
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2008-2016 Sarah Walker. * Copyright 2008-2016 Sarah Walker.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2017 Fred N. van Kempen.
@@ -92,6 +93,10 @@ typedef struct _device_ {
} device_t; } device_t;
#ifdef __cplusplus
extern "C" {
#endif
extern void device_init(void); extern void device_init(void);
extern void device_add(device_t *d); extern void device_add(device_t *d);
extern void device_close_all(void); extern void device_close_all(void);
@@ -117,5 +122,9 @@ extern int device_is_valid(device_t *device, int machine_flags);
extern int machine_get_config_int(char *s); extern int machine_get_config_int(char *s);
extern char *machine_get_config_string(char *s); extern char *machine_get_config_string(char *s);
#ifdef __cplusplus
}
#endif
#endif /*EMU_DEVICE_H*/ #endif /*EMU_DEVICE_H*/

17
src/floppy/floppy.h
View File

@@ -9,10 +9,11 @@
* Generic floppy disk interface that communicates with the * Generic floppy disk interface that communicates with the
* other handlers. * other handlers.
* *
* Version: @(#)floppy.h 1.0.3 2017/09/03 * Version: @(#)floppy.h 1.0.4 2017/10/15
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2017 Sarah Walker. * Copyright 2008-2017 Sarah Walker.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2017 Miran Grca.
*/ */
@@ -176,17 +177,17 @@ void d86f_reset_index_hole_pos(int drive, int side);
uint16_t d86f_prepare_pretrack(int drive, int side, int iso); uint16_t d86f_prepare_pretrack(int drive, int side, int iso);
uint16_t d86f_prepare_sector(int drive, int side, int prev_pos, uint8_t *id_buf, uint8_t *data_buf, int data_len, int gap2, int gap3, int deleted, int bad_crc); uint16_t d86f_prepare_sector(int drive, int side, int prev_pos, uint8_t *id_buf, uint8_t *data_buf, int data_len, int gap2, int gap3, int deleted, int bad_crc);
int gap3_sizes[5][8][48]; extern int gap3_sizes[5][8][48];
void null_writeback(int drive); void null_writeback(int drive);
void null_write_data(int drive, int side, uint16_t pos, uint8_t data); void null_write_data(int drive, int side, uint16_t pos, uint8_t data);
int null_format_conditions(int drive); int null_format_conditions(int drive);
void d86f_unregister(int drive); void d86f_unregister(int drive);
uint8_t dmf_r[21]; extern uint8_t dmf_r[21];
uint8_t xdf_physical_sectors[2][2]; extern uint8_t xdf_physical_sectors[2][2];
uint8_t xdf_gap3_sizes[2][2]; extern uint8_t xdf_gap3_sizes[2][2];
uint16_t xdf_trackx_spos[2][8]; extern uint16_t xdf_trackx_spos[2][8];
typedef struct typedef struct
{ {
@@ -200,8 +201,8 @@ typedef union
xdf_id_t id; xdf_id_t id;
} xdf_sector_t; } xdf_sector_t;
xdf_sector_t xdf_img_layout[2][2][46]; extern xdf_sector_t xdf_img_layout[2][2][46];
xdf_sector_t xdf_disk_layout[2][2][38]; extern xdf_sector_t xdf_disk_layout[2][2][38];
uint32_t td0_get_raw_tsize(int side_flags, int slower_rpm); uint32_t td0_get_raw_tsize(int side_flags, int slower_rpm);

14
src/ibm.h
View File

@@ -10,7 +10,7 @@
* *
* !!!NOTE!!! The goal is to GET RID of this file. Do NOT add stuff !! * !!!NOTE!!! The goal is to GET RID of this file. Do NOT add stuff !!
* *
* Version: @(#)ibm.h 1.0.8 2017/10/04 * Version: @(#)ibm.h 1.0.9 2017/10/15
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -129,7 +129,7 @@ typedef union MMX_REG
int8_t sb[8]; int8_t sb[8];
} MMX_REG; } MMX_REG;
struct struct _cpustate_
{ {
x86reg regs[8]; x86reg regs[8];
@@ -235,7 +235,7 @@ extern uint8_t *pccache2;
void loadseg(uint16_t seg, x86seg *s); void loadseg(uint16_t seg, x86seg *s);
void loadcs(uint16_t seg); void loadcs(uint16_t seg);
union union _cr0_
{ {
uint32_t l; uint32_t l;
uint16_t w; uint16_t w;
@@ -597,6 +597,10 @@ extern int scale;
/* Function prototypes. */ /* Function prototypes. */
#ifdef __cplusplus
extern "C" {
#endif
extern void pclog(const char *format, ...); extern void pclog(const char *format, ...);
extern void fatal(const char *format, ...); extern void fatal(const char *format, ...);
extern wchar_t *pc_concat(wchar_t *str); extern wchar_t *pc_concat(wchar_t *str);
@@ -648,6 +652,10 @@ extern void x86ts(char *s, uint16_t error);
extern void x87_dumpregs(void); extern void x87_dumpregs(void);
extern void x87_reset(void); extern void x87_reset(void);
#ifdef __cplusplus
}
#endif
/* Configuration values. */ /* Configuration values. */
#define SERIAL_MAX 2 #define SERIAL_MAX 2

4
src/network/network.c
View File

@@ -12,7 +12,7 @@
* it should be malloc'ed and then linked to the NETCARD def. * it should be malloc'ed and then linked to the NETCARD def.
* Will be done later. * Will be done later.
* *
* Version: @(#)network.c 1.0.13 2017/10/09 * Version: @(#)network.c 1.0.14 2017/10/15
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* *
@@ -107,7 +107,7 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx)
if (network_card == 0) return(ret); if (network_card == 0) return(ret);
/* Save the card's callback info. */ /* Save the card's callback info. */
net_cards[network_card].private = dev; net_cards[network_card].priv = dev;
net_cards[network_card].rx = rx; net_cards[network_card].rx = rx;
/* Start the platform module. */ /* Start the platform module. */

4
src/network/network.h
View File

@@ -8,7 +8,7 @@
* *
* Definitions for the network module. * Definitions for the network module.
* *
* Version: @(#)network.h 1.0.7 2017/06/03 * Version: @(#)network.h 1.0.8 2017/10/15
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/ */
@@ -35,7 +35,7 @@ typedef struct {
char name[64]; char name[64];
char internal_name[32]; char internal_name[32];
device_t *device; device_t *device;
void *private; void *priv;
int (*poll)(void *); int (*poll)(void *);
NETRXCB rx; NETRXCB rx;
} netcard_t; } netcard_t;

4
src/plat.h
View File

@@ -8,7 +8,7 @@
* *
* Define the various platform support functions. * Define the various platform support functions.
* *
* Version: @(#)plat.h 1.0.7 2017/10/14 * Version: @(#)plat.h 1.0.8 2017/10/15
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -25,6 +25,7 @@ extern "C" {
#endif #endif
/* Global variables residing in the platform module. */ /* Global variables residing in the platform module. */
extern int dopause;
/* System-related functions. */ /* System-related functions. */
@@ -38,6 +39,7 @@ extern int dir_check_exist(wchar_t *path);
extern int dir_create(wchar_t *path); extern int dir_create(wchar_t *path);
extern void leave_fullscreen(void); extern void leave_fullscreen(void);
extern void plat_pc_reset(int hard);
extern void plat_pause(int p); extern void plat_pause(int p);

5
src/scsi/scsi.h
View File

@@ -8,11 +8,12 @@
* *
* SCSI controller handler header. * SCSI controller handler header.
* *
* Version: @(#)scsi_h 1.0.7 2017/10/07 * Version: @(#)scsi_h 1.0.8 2017/10/15
* *
* Authors: TheCollector1995, <mariogplayer@gmail.com> * Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2016,2017 TheCollector1995. * Copyright 2016,2017 TheCollector1995.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2017 Fred N. van Kempen.
@@ -215,7 +216,7 @@ extern uint8_t SCSIStatus;
extern uint8_t SCSIPhase; extern uint8_t SCSIPhase;
extern uint8_t scsi_cdrom_id; extern uint8_t scsi_cdrom_id;
struct { struct _scsisense_ {
uint8_t SenseBuffer[18]; uint8_t SenseBuffer[18];
uint8_t SenseLength; uint8_t SenseLength;
uint8_t UnitAttention; uint8_t UnitAttention;