Merge branch '86Box:master' into pc140_6260

src/include/86box/hdc_ide.h

@@ -82,7 +82,7 @@ typedef struct ide_s {
     uint8_t  selected;
     uint8_t  command;
     uint8_t  head;
-    uint8_t  pad;
+    uint8_t  params_specified;
     int      type;
     int      board;
     int      irqstat;

src/include/86box/keyboard.h

@@ -245,6 +245,7 @@ extern const device_t keyboard_ps2_ami_device;
 extern const device_t keyboard_ps2_tg_ami_device;
 extern const device_t keyboard_ps2_tg_ami_green_device;
 extern const device_t keyboard_ps2_olivetti_device;
+extern const device_t keyboard_ps2_phoenix_device;
 extern const device_t keyboard_ps2_mca_2_device;
 extern const device_t keyboard_ps2_quadtel_device;
 extern const device_t keyboard_ps2_pci_device;
@@ -276,7 +277,9 @@ extern int      keyboard_isfsexit_up(void);
 extern int      keyboard_ismsexit(void);
 extern void     keyboard_set_is_amstrad(int ams);
 
+extern void         kbc_at_set_fast_reset(uint8_t new_fast_reset);
 extern void         kbc_at_handler(int set, void *priv);
+
 extern uint8_t      kbc_at_dev_queue_pos(atkbc_dev_t *dev, uint8_t main);
 extern void         kbc_at_dev_queue_add(atkbc_dev_t *dev, uint8_t val, uint8_t main);
 extern void         kbc_at_dev_reset(atkbc_dev_t *dev, int do_fa);

src/include/86box/scsi_device.h

@@ -308,7 +308,7 @@
 #define BUS_REQ                       0x20
 #define BUS_BSY                       0x40
 #define BUS_RST                       0x80
-#define BUS_ACK                       0x200
+#define BUS_ACK                       0x100
 #define BUS_ATN                       0x200
 #define BUS_ARB                       0x8000
 #define BUS_SETDATA(val)              ((uint32_t) val << 16)

src/include/86box/scsi_ncr5380.h

@@ -109,14 +109,10 @@ typedef struct ncr_t {
     int     data_pos;
 
     int     irq;
-    int     simple_pseudo_dma;
-
-    uint32_t block_count;
 
     double  period;
 
     void   *priv;
-    void  (*dma_init_ext)(void *priv, void *ext_priv, int send);
     void  (*dma_mode_ext)(void *priv, void *ext_priv);
     int   (*dma_send_ext)(void *priv, void *ext_priv);
     int   (*dma_initiator_receive_ext)(void *priv, void *ext_priv);
@@ -131,11 +127,11 @@ extern uint32_t ncr5380_get_bus_host(ncr_t *ncr);
 extern void     ncr5380_bus_read(ncr_t *ncr);
 extern void     ncr5380_bus_update(ncr_t *ncr, int bus);
 extern void     ncr5380_write(uint16_t port, uint8_t val, ncr_t *ncr);
-extern uint8_t  ncr5380_drq(ncr_t *ncr);
 extern uint8_t  ncr5380_read(uint16_t port, ncr_t *ncr);
 
 #ifdef EMU_DEVICE_H
 extern const device_t scsi_lcs6821n_device;
+extern const device_t scsi_pas_device;
 extern const device_t scsi_rt1000b_device;
 extern const device_t scsi_rt1000mc_device;
 extern const device_t scsi_t128_device;
@@ -145,7 +141,6 @@ extern const device_t scsi_ls2000_device;
 #if defined(DEV_BRANCH) && defined(USE_SUMO)
 extern const device_t scsi_scsiat_device;
 #endif
-extern const device_t scsi_pas_device;
 #endif
 
 #endif /*SCSI_NCR5380_H*/

src/include/86box/scsi_t128.h

@@ -18,45 +18,34 @@
  *          Copyright 2017-2024 TheCollector1995.
  */
 
-#ifndef SCSI_NCR53C400_H
-#define SCSI_NCR53C400_H
+#ifndef SCSI_T128_H
+#define SCSI_T128_H
 
-typedef struct ncr53c400_t {
-    rom_t         bios_rom;
-    mem_mapping_t mapping;
+typedef struct t128_t {
     ncr_t   ncr;
+    rom_t   bios_rom;
+    mem_mapping_t mapping;
+
+    uint8_t ctrl;
+    uint8_t status;
     uint8_t buffer[512];
-    uint8_t int_ram[0x40];
-    uint8_t ext_ram[0x600];
+    uint8_t ext_ram[0x80];
+    uint8_t block_count;
+
+    int block_loaded;
+    int pos, host_pos;
 
     uint32_t rom_addr;
-    uint16_t base;
 
-    int8_t  type;
-    uint8_t block_count;
-    uint8_t status_ctrl;
-
-    int simple_ctrl;
-
-    int block_count_loaded;
-
-    int buffer_pos;
-    int buffer_host_pos;
-
-    int     busy;
+    int bios_enabled;
     uint8_t pos_regs[8];
 
     pc_timer_t timer;
-} ncr53c400_t;
+} t128_t;
 
-#define CTRL_DATA_DIR           0x40
-#define STATUS_BUFFER_NOT_READY 0x04
-#define STATUS_5380_ACCESSIBLE  0x80
+extern void    t128_write(uint32_t addr, uint8_t val, void *priv);
+extern uint8_t t128_read(uint32_t addr, void *priv);
 
-extern void    ncr53c400_simple_write(uint8_t val, void *priv);
-extern void    ncr53c400_write(uint32_t addr, uint8_t val, void *priv);
-extern uint8_t ncr53c400_simple_read(void *priv);
-extern uint8_t ncr53c400_read(uint32_t addr, void *priv);
-extern void    ncr53c400_callback(void *priv);
+extern void    t128_callback(void *priv);
 
-#endif /*SCSI_NCR53C400_H*/
+#endif /*SCSI_T128_H*/

src/include/86box/sio.h

@@ -43,6 +43,7 @@ extern const device_t fdc37c931apm_compaq_device;
 extern const device_t fdc37c932fr_device;
 extern const device_t fdc37c932qf_device;
 extern const device_t fdc37c935_device;
+extern const device_t fdc37c935_370_device;
 extern const device_t fdc37c935_no_nvr_device;
 extern const device_t fdc37m60x_device;
 extern const device_t fdc37m60x_370_device;