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

Yet more tabs to spaces

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-14 21:23:54 -04:00
parent 375f69ed61
commit bd6508350b
23 changed files with 5994 additions and 6002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1550
src/device/clock_ics9xxx.c
View File

File diff suppressed because it is too large Load Diff

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

@@ -179,7 +179,7 @@ extern void reset_screen_size_monitor(int monitor_index);
extern void set_screen_size_natural(void); extern void set_screen_size_natural(void);
extern void update_mouse_msg(void); extern void update_mouse_msg(void);
#if 0 #if 0
extern void pc_reload(wchar_t *fn); extern void pc_reload(wchar_t *fn);
#endif #endif
extern int pc_init_modules(void); extern int pc_init_modules(void);
extern int pc_init(int argc, char *argv[]); extern int pc_init(int argc, char *argv[]);

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

@@ -1,5 +1,5 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.

16
src/include/86box/cdrom_interface.h
View File

@@ -1,18 +1,18 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.
* *
* This file is part of the 86Box distribution. * This file is part of the 86Box distribution.
* *
* Definitions for the common CD-ROM interface controller handler. * Definitions for the common CD-ROM interface controller handler.
* *
* *
* *
* Authors: TheCollector1995 * Authors: TheCollector1995
* *
* Copyright 2022 TheCollector1995. * Copyright 2022 TheCollector1995.
*/ */
#ifndef EMU_CDROM_INTERFACE_H #ifndef EMU_CDROM_INTERFACE_H
#define EMU_CDROM_INTERFACE_H #define EMU_CDROM_INTERFACE_H

12
src/include/86box/lpt.h
View File

@@ -53,13 +53,13 @@ extern void lpt1_remove_ams(void);
#define lpt4_remove() lpt_port_remove(3) #define lpt4_remove() lpt_port_remove(3)
#if 0 #if 0
#define lpt5_init(a) lpt_port_init(4, a) #define lpt5_init(a) lpt_port_init(4, a)
#define lpt5_irq(a) lpt_port_irq(4, a) #define lpt5_irq(a) lpt_port_irq(4, a)
#define lpt5_remove() lpt_port_remove(4) #define lpt5_remove() lpt_port_remove(4)
#define lpt6_init(a) lpt_port_init(5, a) #define lpt6_init(a) lpt_port_init(5, a)
#define lpt6_irq(a) lpt_port_irq(5, a) #define lpt6_irq(a) lpt_port_irq(5, a)
#define lpt6_remove() lpt_port_remove(5) #define lpt6_remove() lpt_port_remove(5)
#endif #endif
void lpt_devices_init(void); void lpt_devices_init(void);

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

@@ -318,8 +318,8 @@ typedef struct _machine_ {
void *kbc_device; void *kbc_device;
#endif /* EMU_DEVICE_H */ #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). */
uint16_t kbc_p1; uint16_t kbc_p1;
uint32_t gpio; uint32_t gpio;
uint32_t gpio_acpi; uint32_t gpio_acpi;

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

@@ -65,7 +65,7 @@ extern const device_t mouse_logibus_device;
extern const device_t mouse_logibus_onboard_device; extern const device_t mouse_logibus_onboard_device;
extern const device_t mouse_msinport_device; extern const device_t mouse_msinport_device;
# ifdef USE_GENIBUS # ifdef USE_GENIBUS
extern const device_t mouse_genibus_device; extern const device_t mouse_genibus_device;
# endif # endif
extern const device_t mouse_mssystems_device; extern const device_t mouse_mssystems_device;
extern const device_t mouse_msserial_device; extern const device_t mouse_msserial_device;

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

@@ -11,7 +11,7 @@
* *
* *
* *
* Based on @(#)Dev3C501.cpp Oracle (VirtualBox) * Based on @(#)Dev3C501.cpp Oracle (VirtualBox)
* *
* Authors: TheCollector1995, <mariogplayer@gmail.com> * Authors: TheCollector1995, <mariogplayer@gmail.com>
* Oracle * Oracle

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

@@ -49,7 +49,7 @@ extern int strnicmp(const char *s1, const char *s2, size_t n);
# define ftello64 ftello # define ftello64 ftello
# define off64_t off_t # define off64_t off_t
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
// # define fopen64 fopen // # define fopen64 fopen
# define fseeko64 _fseeki64 # define fseeko64 _fseeki64
# define ftello64 _ftelli64 # define ftello64 _ftelli64
# define off64_t off_t # define off64_t off_t

22
src/include/86box/plat_dir.h
View File

@@ -40,23 +40,23 @@ struct dirent {
# define d_namlen d_reclen # define d_namlen d_reclen
typedef struct DIR_t { typedef struct DIR_t {
short flags; /* internal flags */ short flags; /* internal flags */
short offset; /* offset of entry into dir */ short offset; /* offset of entry into dir */
long handle; /* open handle to Win32 system */ long handle; /* open handle to Win32 system */
short sts; /* last known status code */ short sts; /* last known status code */
char *dta; /* internal work data */ char *dta; /* internal work data */
# ifdef UNICODE # ifdef UNICODE
wchar_t dir[MAXDIRLEN + 1]; /* open dir */ wchar_t dir[MAXDIRLEN + 1]; /* open dir */
# else # else
char dir[MAXDIRLEN + 1]; /* open dir */ char dir[MAXDIRLEN + 1]; /* open dir */
# endif # endif
struct dirent dent; /* actual directory entry */ struct dirent dent; /* actual directory entry */
} DIR; } DIR;
/* Directory routine flags. */ /* Directory routine flags. */
# define DIR_F_LOWER 0x0001 /* force to lowercase */ # define DIR_F_LOWER 0x0001 /* force to lowercase */
# define DIR_F_SANE 0x0002 /* force this to sane path */ # define DIR_F_SANE 0x0002 /* force this to sane path */
# define DIR_F_ISROOT 0x0010 /* this is the root directory */ # define DIR_F_ISROOT 0x0010 /* this is the root directory */
/* Function prototypes. */ /* Function prototypes. */
extern DIR *opendir(const char *); extern DIR *opendir(const char *);

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

@@ -67,7 +67,7 @@
#define IDT_CPU_SPEED 1710 /* CPU speed: */ #define IDT_CPU_SPEED 1710 /* CPU speed: */
#define IDT_FPU 1711 /* FPU: */ #define IDT_FPU 1711 /* FPU: */
#define IDT_WAIT_STATES 1712 /* Wait states: */ #define IDT_WAIT_STATES 1712 /* Wait states: */
#define IDT_MB 1713 /* MB == IDC_TEXT_MB */ #define IDT_MB 1713 /* MB == IDC_TEXT_MB */
#define IDT_MEMORY 1714 /* Memory: */ #define IDT_MEMORY 1714 /* Memory: */
/* DLG_CFG_VIDEO */ /* DLG_CFG_VIDEO */

18
src/include/86box/row.h
View File

@@ -1,18 +1,18 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.
* *
* This file is part of the 86Box distribution. * This file is part of the 86Box distribution.
* *
* Definitions for the SMRAM interface. * Definitions for the SMRAM interface.
* *
* *
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016-2020 Miran Grca. * Copyright 2016-2020 Miran Grca.
*/ */
#ifndef EMU_ROW_H #ifndef EMU_ROW_H
@@ -43,4 +43,4 @@ extern void row_set_boundary(uint8_t row_id, uint32_t boundary);
extern device_t row_device; extern device_t row_device;
#endif /*EMU_ROW_H*/ #endif /*EMU_ROW_H*/

50
src/include/86box/scsi_x54x.h
View File

@@ -30,32 +30,32 @@
#define NVR_SIZE 256 /* size of NVR */ #define NVR_SIZE 256 /* size of NVR */
/* EEPROM map and bit definitions. */ /* EEPROM map and bit definitions. */
#define EE0_HOSTID 0x07 /* EE(0) [2:0] */ #define EE0_HOSTID 0x07 /* EE(0) [2:0] */
#define EE0_ALTFLOP 0x80 /* EE(0) [7] FDC at 370h */ #define EE0_ALTFLOP 0x80 /* EE(0) [7] FDC at 370h */
#define EE1_IRQCH 0x07 /* EE(1) [3:0] */ #define EE1_IRQCH 0x07 /* EE(1) [3:0] */
#define EE1_DMACH 0x70 /* EE(1) [7:4] */ #define EE1_DMACH 0x70 /* EE(1) [7:4] */
#define EE2_RMVOK 0x01 /* EE(2) [0] Support removable disks */ #define EE2_RMVOK 0x01 /* EE(2) [0] Support removable disks */
#define EE2_HABIOS 0x02 /* EE(2) [1] HA Bios Space Reserved */ #define EE2_HABIOS 0x02 /* EE(2) [1] HA Bios Space Reserved */
#define EE2_INT19 0x04 /* EE(2) [2] HA Bios Controls INT19 */ #define EE2_INT19 0x04 /* EE(2) [2] HA Bios Controls INT19 */
#define EE2_DYNSCAN 0x08 /* EE(2) [3] Dynamically scan bus */ #define EE2_DYNSCAN 0x08 /* EE(2) [3] Dynamically scan bus */
#define EE2_TWODRV 0x10 /* EE(2) [4] Allow more than 2 drives */ #define EE2_TWODRV 0x10 /* EE(2) [4] Allow more than 2 drives */
#define EE2_SEEKRET 0x20 /* EE(2) [5] Immediate return on seek */ #define EE2_SEEKRET 0x20 /* EE(2) [5] Immediate return on seek */
#define EE2_EXT1G 0x80 /* EE(2) [7] Extended Translation >1GB */ #define EE2_EXT1G 0x80 /* EE(2) [7] Extended Translation >1GB */
#define EE3_SPEED 0x00 /* EE(3) [7:0] DMA Speed */ #define EE3_SPEED 0x00 /* EE(3) [7:0] DMA Speed */
#define SPEED_33 0xFF #define SPEED_33 0xFF
#define SPEED_50 0x00 #define SPEED_50 0x00
#define SPEED_56 0x04 #define SPEED_56 0x04
#define SPEED_67 0x01 #define SPEED_67 0x01
#define SPEED_80 0x02 #define SPEED_80 0x02
#define SPEED_10 0x03 #define SPEED_10 0x03
#define EE4_FLOPTOK 0x80 /* EE(4) [7] Support Flopticals */ #define EE4_FLOPTOK 0x80 /* EE(4) [7] Support Flopticals */
#define EE6_PARITY 0x01 /* EE(6) [0] parity check enable */ #define EE6_PARITY 0x01 /* EE(6) [0] parity check enable */
#define EE6_TERM 0x02 /* EE(6) [1] host term enable */ #define EE6_TERM 0x02 /* EE(6) [1] host term enable */
#define EE6_RSTBUS 0x04 /* EE(6) [2] reset SCSI bus on boot */ #define EE6_RSTBUS 0x04 /* EE(6) [2] reset SCSI bus on boot */
#define EEE_SYNC 0x01 /* EE(E) [0] Enable Sync Negotiation */ #define EEE_SYNC 0x01 /* EE(E) [0] Enable Sync Negotiation */
#define EEE_DISCON 0x02 /* EE(E) [1] Enable Disconnection */ #define EEE_DISCON 0x02 /* EE(E) [1] Enable Disconnection */
#define EEE_FAST 0x04 /* EE(E) [2] Enable FAST SCSI */ #define EEE_FAST 0x04 /* EE(E) [2] Enable FAST SCSI */
#define EEE_START 0x08 /* EE(E) [3] Enable Start Unit */ #define EEE_START 0x08 /* EE(E) [3] Enable Start Unit */
/* /*
* Host Adapter I/O ports. * Host Adapter I/O ports.
@@ -166,11 +166,11 @@
#define FOURTEEN_BYTES 0x00 /* Request Sense Buffer size */ #define FOURTEEN_BYTES 0x00 /* Request Sense Buffer size */
#define NO_AUTO_REQUEST_SENSE 0x01 /* No Request Sense Buffer */ #define NO_AUTO_REQUEST_SENSE 0x01 /* No Request Sense Buffer */
/* Bytes 4, 5 and 6 Data Length - Data transfer byte count */ /* Bytes 4, 5 and 6 Data Length - Data transfer byte count */
/* Bytes 7, 8 and 9 Data Pointer - SGD List or Data Buffer */ /* Bytes 7, 8 and 9 Data Pointer - SGD List or Data Buffer */
/* Bytes 10, 11 and 12 Link Pointer - Next CCB in Linked List */ /* Bytes 10, 11 and 12 Link Pointer - Next CCB in Linked List */
/* Byte 13 Command Link ID - TBD (I don't know yet) */ /* Byte 13 Command Link ID - TBD (I don't know yet) */
/* Byte 14 Host Status - Host Adapter status */ /* Byte 14 Host Status - Host Adapter status */
#define CCB_COMPLETE 0x00 /* CCB completed without error */ #define CCB_COMPLETE 0x00 /* CCB completed without error */
#define CCB_LINKED_COMPLETE 0x0A /* Linked command completed */ #define CCB_LINKED_COMPLETE 0x0A /* Linked command completed */
#define CCB_LINKED_COMPLETE_INT 0x0B /* Linked complete with intr */ #define CCB_LINKED_COMPLETE_INT 0x0B /* Linked complete with intr */

10
src/include/86box/snd_emu8k.h
View File

@@ -668,11 +668,11 @@ Short Delay Short Delay + Feedback
// Chorus Params // Chorus Params
typedef struct { typedef struct {
WORD FbkLevel; // Feedback Level (0xE600-0xE6FF) WORD FbkLevel; // Feedback Level (0xE600-0xE6FF)
WORD Delay; // Delay (0-0x0DA3) [1/44100 sec] WORD Delay; // Delay (0-0x0DA3) [1/44100 sec]
WORD LfoDepth; // LFO Depth (0xBC00-0xBCFF) WORD LfoDepth; // LFO Depth (0xBC00-0xBCFF)
DWORD DelayR; // Right Delay (0-0xFFFFFFFF) [1/256/44100 sec] DWORD DelayR; // Right Delay (0-0xFFFFFFFF) [1/256/44100 sec]
DWORD LfoFreq; // LFO Frequency (0-0xFFFFFFFF) DWORD LfoFreq; // LFO Frequency (0-0xFFFFFFFF)
} CHORUS_TYPE; } CHORUS_TYPE;

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

@@ -8,7 +8,7 @@
* *
* Definitions for the NukedOPL3 driver. * Definitions for the NukedOPL3 driver.
* *
* Version: @(#)snd_opl_nuked.h 1.0.5 2020/07/16 * Version: @(#)snd_opl_nuked.h 1.0.5 2020/07/16
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>

6
src/include/86box/vid_pgc.h
View File

@@ -156,12 +156,12 @@ extern void pgc_sto_raster(pgc_t *, int16_t *x, int16_t *y);
extern void pgc_ito_raster(pgc_t *, int32_t *x, int32_t *y); extern void pgc_ito_raster(pgc_t *, int32_t *x, int32_t *y);
extern void pgc_dto_raster(pgc_t *, double *x, double *y); extern void pgc_dto_raster(pgc_t *, double *x, double *y);
#if 0 #if 0
extern int pgc_input_byte(pgc_t *, uint8_t *val); extern int pgc_input_byte(pgc_t *, uint8_t *val);
extern int pgc_output_byte(pgc_t *, uint8_t val); extern int pgc_output_byte(pgc_t *, uint8_t val);
#endif #endif
extern int pgc_output_string(pgc_t *, const char *val); extern int pgc_output_string(pgc_t *, const char *val);
#if 0 #if 0
extern int pgc_error_byte(pgc_t *, uint8_t val); extern int pgc_error_byte(pgc_t *, uint8_t val);
#endif #endif
extern int pgc_error_string(pgc_t *, const char *val); extern int pgc_error_string(pgc_t *, const char *val);
extern int pgc_error(pgc_t *, int err); extern int pgc_error(pgc_t *, int err);

16
src/include/86box/vid_voodoo_blitter.h
View File

@@ -1,18 +1,18 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.
* *
* This file is part of the 86Box distribution. * This file is part of the 86Box distribution.
* *
* 3DFX Voodoo emulation. * 3DFX Voodoo emulation.
* *
* *
* *
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/> * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* *
* Copyright 2008-2020 Sarah Walker. * Copyright 2008-2020 Sarah Walker.
*/ */
#ifndef VIDEO_VOODOO_BLITTER_H #ifndef VIDEO_VOODOO_BLITTER_H

10264
src/include/86box/vid_voodoo_dither.h
View File

File diff suppressed because it is too large Load Diff

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

@@ -152,7 +152,7 @@ extern int changeframecount;
extern volatile int screenshots; extern volatile int screenshots;
#if 0 #if 0
extern bitmap_t *buffer32; extern bitmap_t *buffer32;
#endif #endif
#define buffer32 (monitors[monitor_index_global].target_buffer) #define buffer32 (monitors[monitor_index_global].target_buffer)
#define pal_lookup (monitors[monitor_index_global].mon_pal_lookup) #define pal_lookup (monitors[monitor_index_global].mon_pal_lookup)
@@ -179,7 +179,7 @@ extern bitmap_t *buffer32;
extern PALETTE cgapal; extern PALETTE cgapal;
extern PALETTE cgapal_mono[6]; extern PALETTE cgapal_mono[6];
#if 0 #if 0
extern uint32_t pal_lookup[256]; extern uint32_t pal_lookup[256];
#endif #endif
extern int video_fullscreen; extern int video_fullscreen;
extern int video_fullscreen_scale; extern int video_fullscreen_scale;

4
src/machine/m_at_compaq.c
View File

@@ -705,8 +705,8 @@ const device_config_t compaq_plasma_config[] = {
// clang-format off // clang-format off
{ {
.name = "rgb_type", .name = "rgb_type",
.description = "RGB type", .description = "RGB type",
.type = CONFIG_SELECTION, .type = CONFIG_SELECTION,
.default_string = "", .default_string = "",
.default_int = 0, .default_int = 0,
.file_filter = "", .file_filter = "",

2
src/sound/munt/CMakeLists.txt
View File

@@ -22,5 +22,5 @@ add_library(mt32emu STATIC Analog.cpp BReverbModel.cpp Display.cpp File.cpp File
srchelper/srctools/src/LinearResampler.cpp srchelper/srctools/src/LinearResampler.cpp
srchelper/srctools/src/ResamplerModel.cpp srchelper/srctools/src/ResamplerModel.cpp
srchelper/srctools/src/SincResampler.cpp srchelper/srctools/src/SincResampler.cpp
srchelper/InternalResampler.cpp Synth.cpp Tables.cpp TVA.cpp TVF.cpp srchelper/InternalResampler.cpp Synth.cpp Tables.cpp TVA.cpp TVF.cpp
TVP.cpp sha1/sha1.cpp c_interface/c_interface.cpp) TVP.cpp sha1/sha1.cpp c_interface/c_interface.cpp)

2
src/video/vid_ati_mach8.c
View File

@@ -3654,7 +3654,7 @@ mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
svga_recalctimings(svga); svga_recalctimings(svga);
break; break;
case 0x1ee8: case 0x1ee8:
case 0x1ee9: case 0x1ee9:
mach_log("ATI 8514/A: V_SYNC_WID write 1EE8 = %02x\n", val); mach_log("ATI 8514/A: V_SYNC_WID write 1EE8 = %02x\n", val);
svga_recalctimings(svga); svga_recalctimings(svga);

2
src/video/vid_svga.c
View File

@@ -538,7 +538,7 @@ svga_set_ramdac_type(svga_t *svga, int type)
void void
svga_recalctimings(svga_t *svga) svga_recalctimings(svga_t *svga)
{ {
ibm8514_t *dev = &svga->dev8514; ibm8514_t *dev = &svga->dev8514;
double crtcconst; double crtcconst;
double _dispontime; double _dispontime;
double _dispofftime; double _dispofftime;