Apple build fix

This commit is contained in:
Jasmine Iwanek
2023-07-20 15:59:54 -04:00
parent ee695e71f9
commit db66543959
45 changed files with 134 additions and 1 deletions

View File

@@ -652,7 +652,9 @@ cdi_cue_get_buffer(char *str, char **line, int up)
done = 1;
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
if (up && islower((int) *s))

View File

@@ -324,7 +324,9 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
break;
case 5:
dev->readmsf = 0;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 4:
case 3:
dev->readmsf |= CD_DCB(val) << ((dev->cmdrd_count - 3) << 3);

View File

@@ -108,7 +108,9 @@ ali1621_smram_recalc(uint8_t val, ali1621_t *dev)
switch (val & 0x30) {
case 0x10: /* Open. */
access_normal = ACCESS_SMRAM_RX;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x30: /* Protect. */
access_smm |= ACCESS_SMRAM_R;
break;
@@ -121,7 +123,9 @@ ali1621_smram_recalc(uint8_t val, ali1621_t *dev)
switch (val & 0x30) {
case 0x10: /* Open. */
access_normal |= ACCESS_SMRAM_W;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x30: /* Protect. */
access_smm |= ACCESS_SMRAM_W;
break;

View File

@@ -233,7 +233,9 @@ ali6117_reg_write(uint16_t addr, uint8_t val, void *priv)
case 0x12:
val &= 0xf7;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x14:
case 0x15:

View File

@@ -228,7 +228,9 @@ opti283_write(uint16_t addr, uint8_t val, void *priv)
case 0x14:
reset_on_hlt = !!(val & 0x40);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x11:
case 0x12:
case 0x13:

View File

@@ -1474,7 +1474,9 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
case 0xd2:
if (dev->local == VIA_PIPC_686B)
smbus_piix4_setclock(dev->smbus, (val & 0x04) ? 65536 : 16384);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x90:
case 0x91:

View File

@@ -463,7 +463,9 @@ kbc_at_poll_at(atkbc_t *dev)
case STATE_KBC_AMI_OUT:
if (dev->status & STAT_OFULL)
break;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_MAIN_IBF:
default:
at_main_ibf:
@@ -586,7 +588,9 @@ kbc_at_poll_ps2(atkbc_t *dev)
case STATE_KBC_AMI_OUT:
if (dev->status & STAT_OFULL)
break;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_MAIN_IBF:
default:
ps2_main_ibf:

View File

@@ -135,7 +135,9 @@ kbc_at_dev_poll(void *priv)
dev->port->wantcmd = 0;
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case DEV_STATE_MAIN_WANT_IN:
/* Output command response and then return to main loop #2. */
if ((dev->port->out_new == -1) && (dev->cmd_queue_start != dev->cmd_queue_end)) {

View File

@@ -507,7 +507,9 @@ sermouse_command_timer(void *priv)
break;
case PHASE_ACK:
serial_write_fifo(dev->serial, 0x06);
#ifndef __APPLE__
[[fallthrough]];
#endif
case PHASE_BAUD_RATE:
sermouse_command_phase_idle(dev);
sermouse_timer_on(dev, dev->report_period, 1);
@@ -645,7 +647,9 @@ ltsermouse_write(UNUSED(struct serial_s *serial), void *priv, uint8_t data)
switch (data) {
default:
mouse_serial_log("Serial mouse: Invalid period %02X, using 1200 bps\n", data);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x6E:
dev->transmit_period = sermouse_transmit_period(dev, 1200, -1);
break;

View File

@@ -193,7 +193,9 @@ smbus_ali7101_write(uint16_t addr, uint8_t val, void *priv)
case 0x4: /* block R/W */
timer_bytes++; /* count the SMBus length byte now */
#ifndef __APPLE__
[[fallthrough]];
#endif
default: /* unknown */
dev->next_stat = 0x20; /* raise DEV_ERR */

View File

@@ -195,7 +195,9 @@ smbus_piix4_write(uint16_t addr, uint8_t val, void *priv)
timer_bytes++;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xc: /* I2C process call */
if (!read) { /* word write (only when writing) */
@@ -214,7 +216,9 @@ smbus_piix4_write(uint16_t addr, uint8_t val, void *priv)
case 0x5: /* block R/W */
timer_bytes++; /* count the SMBus length byte now */
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xd: /* I2C block R/W */
i2c_write(i2c_smbus, smbus_addr, dev->cmd);
@@ -247,7 +251,9 @@ smbus_piix4_write(uint16_t addr, uint8_t val, void *priv)
i2c_write(i2c_smbus, smbus_addr, dev->cmd);
timer_bytes++;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xe: /* I2C with 7-bit address */
if (!read) { /* word write (only when writing) */

View File

@@ -338,7 +338,9 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
esdi->command &= ~0x03;
if (val & 0x02)
fatal("Read with ECC\n");
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xa0:
esdi->status = STAT_BUSY;
@@ -397,7 +399,9 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
default:
esdi_at_log("WD1007: bad command %02X\n", val);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xe8: /*???*/
esdi->status = STAT_BUSY;
esdi_set_callback(esdi, 200 * HDC_TIME);

View File

@@ -1655,7 +1655,9 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
disabled, the Read Multiple operation is rejected with an Aborted Com-
mand error. */
ide->blockcount = 0;
#ifndef __APPLE__
[[fallthrough]];
#endif
case WIN_READ:
case WIN_READ_NORETRY:
@@ -1704,7 +1706,9 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
/* Turn on the activity indicator *here* so that it gets turned on
less times. */
ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
#ifndef __APPLE__
[[fallthrough]];
#endif
case WIN_WRITE:
case WIN_WRITE_NORETRY:

View File

@@ -623,7 +623,9 @@ st506_callback(void *priv)
st506_complete(dev);
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case CMD_FORMAT_TRACK:
case CMD_FORMAT_BAD_TRACK:
@@ -1606,7 +1608,9 @@ st506_init(const device_t *info)
case ST506_XT_TYPE_ST11R: /* Seagate ST-11R (RLL) */
dev->spt = RLL_SECTORS;
#ifndef __APPLE__
[[fallthrough]];
#endif
case ST506_XT_TYPE_ST11M: /* Seagate ST-11M (MFM) */
dev->nr_err = ERR_NOT_AVAILABLE;

View File

@@ -509,7 +509,9 @@ hdc_callback(void *priv)
case CMD_READ_VERIFY:
no_data = 1;
#ifndef __APPLE__
[[fallthrough]];
#endif
case CMD_READ_SECTORS:
if (!drive->present) {
@@ -534,7 +536,9 @@ hdc_callback(void *priv)
dev->buf_len = 512;
dev->state = STATE_SEND;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_SEND:
/* Activate the status icon. */
@@ -642,7 +646,9 @@ do_send:
dev->buf_len = 512;
dev->state = STATE_RECV;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_RECV:
/* Activate the status icon. */

View File

@@ -655,7 +655,9 @@ mo_update_request_length(mo_t *dev, int len, int block_len)
break;
}
}
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
dev->packet_len = len;
break;
@@ -1342,7 +1344,9 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
mo_invalid_field(dev);
return;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case GPCMD_SCSI_RESERVE:
case GPCMD_SCSI_RELEASE:
case GPCMD_TEST_UNIT_READY:

View File

@@ -821,7 +821,9 @@ zip_update_request_length(zip_t *dev, int len, int block_len)
break;
}
}
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
dev->packet_len = len;
@@ -1409,7 +1411,9 @@ zip_command(scsi_common_t *sc, uint8_t *cdb)
zip_invalid_field(dev);
return;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case GPCMD_SCSI_RESERVE:
case GPCMD_SCSI_RELEASE:
case GPCMD_TEST_UNIT_READY:
@@ -1572,7 +1576,9 @@ zip_command(scsi_common_t *sc, uint8_t *cdb)
zip_command_complete(dev);
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case GPCMD_WRITE_6:
case GPCMD_WRITE_10:
case GPCMD_WRITE_AND_VERIFY_10:

View File

@@ -916,7 +916,9 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
fdc_bad_command(fdc);
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x07: /*Recalibrate*/
fdc->pnum = 0;
fdc->ptot = 1;
@@ -959,7 +961,9 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
fdc_bad_command(fdc);
break;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x10: /*Get version*/
case 0x14: /*Unlock*/
case 0x94: /*Lock*/
@@ -1081,7 +1085,9 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
case 0x16: /* Verify */
if (fdc->params[0] & 0x80)
fdc->sc = fdc->params[7];
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x06: /* Read data */
case 0x0c: /* Read deleted data */
fdc_io_command_phase1(fdc, 0);

View File

@@ -1951,7 +1951,9 @@ d86f_format_track(int drive, int side, int do_write)
if (dev->datac == 3)
fdc_stop_id_request(d86f_fdc);
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case FMT_PRETRK_SYNC:
case FMT_SECTOR_DATA_SYNC:
@@ -2294,7 +2296,9 @@ d86f_turbo_poll(int drive, int side)
case STATE_0D_SPIN_TO_INDEX:
dev->sector_count = 0;
dev->datac = 5;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_02_SPIN_TO_INDEX:
dev->state++;
@@ -2339,7 +2343,9 @@ d86f_turbo_poll(int drive, int side)
dev->last_sector.id.r = dev->req_sector.id.r;
dev->last_sector.id.n = dev->req_sector.id.n;
d86f_handler[drive].set_sector(drive, side, dev->last_sector.id.c, dev->last_sector.id.h, dev->last_sector.id.r, dev->last_sector.id.n);
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_0A_FIND_ID:
dev->turbo_pos = 0;

View File

@@ -123,7 +123,9 @@ elt_vid_out(uint16_t addr, uint8_t val, void *priv)
case 0x3d1:
if (cga->crtcreg >= 32)
return;
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
cga->crtcreg &= 31;

View File

@@ -699,7 +699,9 @@ do_fmt:
/* Done with this track. */
dev->state = STATE_FDONE;
#ifndef __APPLE__
[[fallthrough]];
#endif
case STATE_FDONE:
/* One more track done. */
if (++start_cyl == end_cyl) {

View File

@@ -749,7 +749,9 @@ nic_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
case 0x10: /* PCI_BAR */
val &= 0xe0; /* 0xe0 acc to RTL DS */
val |= 0x01; /* re-enable IOIN bit */
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x11: /* PCI_BAR */
case 0x12: /* PCI_BAR */

View File

@@ -734,7 +734,9 @@ wd_init(const device_t *info)
/* Ethernet, MCA, 5x3 interface chip, RAM 16k */
case WD8003EA:
dev->board_chip = WE_ID_SOFT_CONFIG;
#ifndef __APPLE__
[[fallthrough]];
#endif
/* Ethernet, MCA, no interface chip, RAM 16k */
case WD8003ETA:
dev->board_chip |= WE_TYPE_WD8013EBT | WE_ID_BUS_MCA;

View File

@@ -210,7 +210,9 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
case 0x10: /* PCI_BAR */
val &= 0xe0; /* 0xe0 acc to RTL DS */
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x11: /* PCI_BAR */
/* Remove old I/O. */

View File

@@ -1462,7 +1462,9 @@ process_char(escp_t *dev, uint8_t ch)
dev->curr_x = dev->left_margin;
if (!dev->autofeed)
return 1;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x0a: /* Line feed */
if (dev->font_style & STYLE_DOUBLEWIDTHONELINE) {

View File

@@ -283,7 +283,9 @@ process_char(prnt_t *dev, uint8_t ch)
dev->curr_x = 0;
if (!dev->autofeed)
return 1;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x0a: /* Line feed */
dev->curr_x = 0;

View File

@@ -1232,7 +1232,9 @@ BuslogicPCIWrite(UNUSED(int func), int addr, uint8_t val, void *priv)
case 0x10:
val &= 0xe0;
val |= 1;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x11:
case 0x12:
@@ -1256,7 +1258,9 @@ BuslogicPCIWrite(UNUSED(int func), int addr, uint8_t val, void *priv)
case 0x14:
val &= 0xe0;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x15:
case 0x16:

View File

@@ -883,7 +883,9 @@ scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, int block_len)
break;
}
}
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
dev->packet_len = len;
@@ -959,7 +961,9 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
scsi_cdrom_log("CD-ROM %i: Seek period: %" PRIu64 " us\n",
dev->id, (uint64_t) period);
dev->callback += period;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x25:
case 0x42:
case 0x43:
@@ -1936,7 +1940,9 @@ begin:
/* IMPORTANT: Convert the command to new read CD
for pass through purposes. */
dev->current_cdb[0] = GPCMD_READ_CD;
#ifndef __APPLE__
[[fallthrough]];
#endif
case GPCMD_READ_6:
case GPCMD_READ_10:

View File

@@ -597,7 +597,9 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
scsi_disk_invalid_field(dev);
return;
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case GPCMD_SCSI_RESERVE:
case GPCMD_SCSI_RELEASE:
case GPCMD_TEST_UNIT_READY:

View File

@@ -1029,7 +1029,9 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
switch (saddr) {
case ESP_TCHI:
dev->tchi_written = 1;
#ifndef __APPLE__
[[fallthrough]];
#endif
case ESP_TCLO:
case ESP_TCMID:
esp_log("Transfer count regs %02x = %i\n", saddr, val);

View File

@@ -486,7 +486,9 @@ x54x_bios_command(x54x_t *x54x, uint8_t max_id, BIOSCMD *cmd, int8_t islba)
default:
x54x_log("BIOS: Unimplemented command: %02X\n", cmd->command);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x05: /* Format Track, invalid since SCSI has no tracks */
case 0x0a: /* ???? */
case 0x0b: /* ???? */

View File

@@ -417,8 +417,9 @@ rate: /* Writable only if VRA/VRM is set. */
/* Get actual previous value. */
prev = dev->vendor_reg_pages[(i << 3) | ((reg & 0x0e) >> 1)];
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x5a ... 0x5e: /* Vendor Reserved */
case 0x70 ... 0x7a:

View File

@@ -241,7 +241,9 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
case 10:
if (ad1848->type < AD1848_TYPE_CS4235)
break;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 8:
updatefreq = 1;

View File

@@ -466,7 +466,9 @@ cmi8x38_sb_mixer_write(uint16_t addr, uint8_t val, void *priv)
case 0xf8 ... 0xff:
if (dev->type == CMEDIA_CMI8338)
mixer->regs[mixer->index] = val;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xf1 ... 0xf7:
return;

View File

@@ -299,7 +299,9 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
switch (val) {
case 0x55: /* Disable PnP Key */
dev->pnp_enable = 0;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x5a: /* Update Hardware Configuration Data */
cs423x_pnp_enable(dev, 0, 1);

View File

@@ -626,7 +626,9 @@ writegus(uint16_t addr, uint8_t val, void *priv)
else if (gus->irq != -1)
picint(1 << gus->irq);
}
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x20d:
gus->sb_2xc = val;
break;

View File

@@ -596,7 +596,9 @@ sb_exec_command(sb_dsp_t *dsp)
case 0x75: /* 4-bit ADPCM output with reference */
dsp->sbref = dsp->dma_readb(dsp->dma_priv);
dsp->sbstep = 0;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x74: /* 4-bit ADPCM output */
sb_start_dma(dsp, 1, 0, ADPCM_4, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);

View File

@@ -536,7 +536,9 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
case 0x92e8:
if (len != 1)
dev->test = val;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xd2e8:
if (len == 1)
dev->accel.err_term = (dev->accel.err_term & 0x3f00) | val;

View File

@@ -93,7 +93,9 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
if (!dat)
break;
eeprom->state = EEPROM_OPCODE;
#ifndef __APPLE__
[[fallthrough]];
#endif
case EEPROM_OPCODE:
eeprom->opcode = (eeprom->opcode << 1) | (dat ? 1 : 0);
eeprom->count--;

View File

@@ -748,7 +748,9 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
case 0x11e:
case 0x11f:
WRITE8(addr, mach64->dst_height_width, val);
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x113:
if (((addr & 0x3ff) == 0x11b || (addr & 0x3ff) == 0x11f || (addr & 0x3ff) == 0x113) && !(val & 0x80)) {
mach64_start_fill(mach64);
@@ -971,7 +973,9 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
case 0x2a4:
case 0x2a5:
addr += 2;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x2aa:
case 0x2ab:
WRITE8(addr, mach64->sc_left_right, val);
@@ -986,7 +990,9 @@ mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val)
case 0x2b0:
case 0x2b1:
addr += 2;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x2b6:
case 0x2b7:
WRITE8(addr, mach64->sc_top_bottom, val);

View File

@@ -2838,7 +2838,9 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
case 0x92e8:
if (len != 1)
dev->test = val;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0xd2e8:
mach_log("92E8 = %04x\n", val);
if (len == 1)

View File

@@ -432,7 +432,9 @@ et4000_kasan_out(uint16_t addr, uint8_t val, void *priv)
case 5:
et4000->kasan_cfg_regs[5] = val;
et4000->svga.ksc5601_english_font_type = 0x100 | val;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 6:
case 7:
et4000->svga.ksc5601_udc_area_msb[et4000->kasan_cfg_index - 0xF6] = val;

View File

@@ -320,7 +320,9 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
svga->adv_flags &= ~FLAG_RAMDAC_SHIFT;
if (val & 0x04)
svga->adv_flags |= FLAG_RAMDAC_SHIFT;
#ifndef __APPLE__
[[fallthrough]];
#endif
/*Bank registers*/
case 0xe8:
case 0xe9:

View File

@@ -664,7 +664,9 @@ mystique_out(uint16_t addr, uint8_t val, void *priv)
switch (addr) {
case 0x3c8:
mystique->xreg_idx = val;
#ifndef __APPLE__
[[fallthrough]];
#endif
case 0x3c6:
case 0x3c7:
case 0x3c9:

View File

@@ -4305,7 +4305,9 @@ s3_virge_init(const device_t *info)
case S3_VIRGE_GX:
virge->virge_rev = 0x01;
#ifndef __APPLE__
[[fallthrough]];
#endif
default:
virge->svga.decode_mask = (4 << 20) - 1;