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

Constification

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-07-20 18:58:26 -04:00
parent db66543959
commit 998cfe5cc8
163 changed files with 1086 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/m_amstrad.c
View File

@@ -277,8 +277,8 @@ vid_out_1512(uint16_t addr, uint8_t val, void *priv)
static uint8_t
vid_in_1512(uint16_t addr, void *priv)
{
amsvid_t *vid = (amsvid_t *) priv;
uint8_t ret = 0xff;
const amsvid_t *vid = (amsvid_t *) priv;
uint8_t ret = 0xff;
if ((addr >= 0x3d0) && (addr <= 0x3d7))
addr = (addr & 0xff9) | 0x004;
@@ -327,7 +327,7 @@ vid_write_1512(uint32_t addr, uint8_t val, void *priv)
static uint8_t
vid_read_1512(uint32_t addr, void *priv)
{
amsvid_t *vid = (amsvid_t *) priv;
const amsvid_t *vid = (amsvid_t *) priv;
cycles -= 12;
addr &= 0x3fff;
@@ -1010,7 +1010,7 @@ static unsigned char mapping2[256] = {
static void
set_lcd_cols(uint8_t mode_reg)
{
unsigned char *mapping = (mode_reg & 0x80) ? mapping2 : mapping1;
const unsigned char *mapping = (mode_reg & 0x80) ? mapping2 : mapping1;
for (uint16_t c = 0; c < 256; c++) {
switch (mapping[c]) {

40
src/machine/m_at_t3100e.c
View File

@@ -480,7 +480,7 @@ t3100e_turbo_set(uint8_t value)
uint8_t
t3100e_sys_in(UNUSED(uint16_t addr), void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
/* The low 4 bits always seem to be 0x0C. The high 4 are a
* notification sent by the keyboard controller when it detects
@@ -613,7 +613,7 @@ t3100e_config_get(void)
uint8_t
t3100e_ems_in(uint16_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int page = port_to_page(addr);
if (page >= 0)
@@ -657,8 +657,8 @@ t3100e_ems_out(uint16_t addr, uint8_t val, void *priv)
static uint8_t
ems_read_ram(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return 0xFF;
@@ -669,8 +669,8 @@ ems_read_ram(uint32_t addr, void *priv)
static uint16_t
ems_read_ramw(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return 0xFFFF;
@@ -687,8 +687,8 @@ ems_read_ramw(uint32_t addr, void *priv)
static uint32_t
ems_read_raml(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return 0xFFFFFFFF;
@@ -700,8 +700,8 @@ ems_read_raml(uint32_t addr, void *priv)
static void
ems_write_ram(uint32_t addr, uint8_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -712,8 +712,8 @@ ems_write_ram(uint32_t addr, uint8_t val, void *priv)
static void
ems_write_ramw(uint32_t addr, uint16_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -731,8 +731,8 @@ ems_write_ramw(uint32_t addr, uint16_t val, void *priv)
static void
ems_write_raml(uint32_t addr, uint32_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -745,7 +745,7 @@ ems_write_raml(uint32_t addr, uint32_t val, void *priv)
static uint8_t
upper_read_ram(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
return ram[addr];
@@ -754,7 +754,7 @@ upper_read_ram(uint32_t addr, void *priv)
static uint16_t
upper_read_ramw(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
return *(uint16_t *) &ram[addr];
@@ -763,7 +763,7 @@ upper_read_ramw(uint32_t addr, void *priv)
static uint32_t
upper_read_raml(uint32_t addr, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
return *(uint32_t *) &ram[addr];
@@ -772,7 +772,7 @@ upper_read_raml(uint32_t addr, void *priv)
static void
upper_write_ram(uint32_t addr, uint8_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
ram[addr] = val;
@@ -781,7 +781,7 @@ upper_write_ram(uint32_t addr, uint8_t val, void *priv)
static void
upper_write_ramw(uint32_t addr, uint16_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
*(uint16_t *) &ram[addr] = val;
@@ -790,7 +790,7 @@ upper_write_ramw(uint32_t addr, uint16_t val, void *priv)
static void
upper_write_raml(uint32_t addr, uint32_t val, void *priv)
{
struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
const struct t3100e_ems_regs *regs = (struct t3100e_ems_regs *) priv;
addr = (addr - (1024 * mem_size)) + regs->upper_base;
*(uint32_t *) &ram[addr] = val;

3
src/machine/m_at_t3100e_vid.c
View File

@@ -217,7 +217,8 @@ t3100e_write(uint32_t addr, uint8_t val, void *priv)
uint8_t
t3100e_read(uint32_t addr, void *priv)
{
t3100e_t *t3100e = (t3100e_t *) priv;
const t3100e_t *t3100e = (t3100e_t *) priv;
cycles -= 4;
return t3100e->vram[addr & 0x7fff];

4
src/machine/m_elt.c
View File

@@ -91,8 +91,8 @@ sysstat_out(UNUSED(uint16_t port), uint8_t val, void *priv)
static uint8_t
sysstat_in(UNUSED(uint16_t port), void *priv)
{
cga_t *cga = priv;
uint8_t ret = 0x0a; /* No idea what these bits are */
const cga_t *cga = priv;
uint8_t ret = 0x0a; /* No idea what these bits are */
/* External CRT. We don't emulate the LCD/CRT switching, let's just
* frivolously use this bit to indicate we're using the LCD if the

2
src/machine/m_pcjr.c
View File

@@ -241,7 +241,7 @@ vid_write(uint32_t addr, uint8_t val, void *priv)
static uint8_t
vid_read(uint32_t addr, void *priv)
{
pcjr_t *pcjr = (pcjr_t *) priv;
const pcjr_t *pcjr = (pcjr_t *) priv;
if (pcjr->memctrl == -1)
return 0xff;

6
src/machine/m_ps1_hdc.c
View File

@@ -1062,7 +1062,7 @@ do_recv:
static void
hdc_send_ssb(hdc_t *dev)
{
drive_t *drive;
const drive_t *drive;
/* We only support one drive, really, but ohwell. */
drive = &dev->drives[0];
@@ -1322,8 +1322,8 @@ ps1_hdc_init(UNUSED(const device_t *info))
static void
ps1_hdc_close(void *priv)
{
hdc_t *dev = (hdc_t *) priv;
drive_t *drive;
hdc_t *dev = (hdc_t *) priv;
const drive_t *drive;
/* Remove the I/O handler. */
io_removehandler(dev->base, 5,

22
src/machine/m_tandy.c
View File

@@ -588,9 +588,9 @@ vid_out(uint16_t addr, uint8_t val, void *priv)
static uint8_t
vid_in(uint16_t addr, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
t1kvid_t *vid = dev->vid;
uint8_t ret = 0xff;
const tandy_t *dev = (tandy_t *) priv;
const t1kvid_t *vid = dev->vid;
uint8_t ret = 0xff;
if ((addr >= 0x3d0) && (addr <= 0x3d7))
addr = (addr & 0xff9) | 0x004;
@@ -639,8 +639,8 @@ vid_write(uint32_t addr, uint8_t val, void *priv)
static uint8_t
vid_read(uint32_t addr, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
t1kvid_t *vid = dev->vid;
const tandy_t *dev = (tandy_t *) priv;
const t1kvid_t *vid = dev->vid;
if (vid->memctrl == -1)
return 0xff;
@@ -1350,8 +1350,8 @@ tandy_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
tandy_read(uint16_t addr, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
uint8_t ret = 0xff;
const tandy_t *dev = (tandy_t *) priv;
uint8_t ret = 0xff;
switch (addr) {
case 0x00a0:
@@ -1376,7 +1376,7 @@ tandy_read(uint16_t addr, void *priv)
static void
write_ram(uint32_t addr, uint8_t val, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
const tandy_t *dev = (tandy_t *) priv;
ram[dev->base + (addr & 0x1ffff)] = val;
}
@@ -1384,7 +1384,7 @@ write_ram(uint32_t addr, uint8_t val, void *priv)
static uint8_t
read_ram(uint32_t addr, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
const tandy_t *dev = (tandy_t *) priv;
return (ram[dev->base + (addr & 0x1ffff)]);
}
@@ -1392,8 +1392,8 @@ read_ram(uint32_t addr, void *priv)
static uint8_t
read_rom(uint32_t addr, void *priv)
{
tandy_t *dev = (tandy_t *) priv;
uint32_t addr2 = (addr & 0xffff) + dev->rom_offset;
const tandy_t *dev = (tandy_t *) priv;
uint32_t addr2 = (addr & 0xffff) + dev->rom_offset;
return (dev->rom[addr2]);
}

2
src/machine/m_xt_olivetti.c
View File

@@ -442,7 +442,7 @@ mm58274_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
mm58274_read(uint16_t addr, void *priv)
{
nvr_t *nvr = (nvr_t *) priv;
const nvr_t *nvr = (nvr_t *) priv;
addr &= 0x0f;

38
src/machine/m_xt_t1000.c
View File

@@ -288,8 +288,8 @@ tc8521_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
tc8521_read(uint16_t addr, void *priv)
{
nvr_t *nvr = (nvr_t *) priv;
uint8_t page;
const nvr_t *nvr = (nvr_t *) priv;
uint8_t page;
/* Get to the correct register page. */
addr &= 0x0f;
@@ -360,7 +360,7 @@ ems_execaddr(t1000_t *sys, UNUSED(int pg), uint16_t val)
static uint8_t
ems_in(uint16_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
const t1000_t *sys = (t1000_t *) priv;
#if 0
t1000_log("ems_in(%04x)=%02x\n", addr, sys->ems_reg[(addr >> 14) & 3]);
@@ -467,7 +467,7 @@ addr_to_page(uint32_t addr)
static uint8_t
ems_read_ram(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
@@ -480,8 +480,8 @@ ems_read_ram(uint32_t addr, void *priv)
static uint16_t
ems_read_ramw(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return 0xff;
@@ -501,8 +501,8 @@ ems_read_ramw(uint32_t addr, void *priv)
static uint32_t
ems_read_raml(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return 0xff;
@@ -515,8 +515,8 @@ ems_read_raml(uint32_t addr, void *priv)
static void
ems_write_ram(uint32_t addr, uint8_t val, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -531,8 +531,8 @@ ems_write_ram(uint32_t addr, uint8_t val, void *priv)
static void
ems_write_ramw(uint32_t addr, uint16_t val, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -555,8 +555,8 @@ ems_write_ramw(uint32_t addr, uint16_t val, void *priv)
static void
ems_write_raml(uint32_t addr, uint32_t val, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
const t1000_t *sys = (t1000_t *) priv;
int pg = addr_to_page(addr);
if (pg < 0)
return;
@@ -571,8 +571,8 @@ ems_write_raml(uint32_t addr, uint32_t val, void *priv)
static uint8_t
read_ctl(uint16_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
uint8_t ret = 0xff;
const t1000_t *sys = (t1000_t *) priv;
uint8_t ret = 0xff;
switch (addr & 0x0f) {
case 1:
@@ -754,7 +754,7 @@ t1000_write_nvram(uint16_t addr, uint8_t val, void *priv)
static uint8_t
read_t1200_nvram(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
const t1000_t *sys = (t1000_t *) priv;
return sys->t1200_nvram[addr & 0x7FF];
}
@@ -774,7 +774,7 @@ write_t1200_nvram(uint32_t addr, uint8_t value, void *priv)
static uint8_t
t1000_read_rom_ctl(UNUSED(uint16_t addr), void *priv)
{
t1000_t *sys = (t1000_t *) priv;
const t1000_t *sys = (t1000_t *) priv;
return (sys->rom_ctl);
}
@@ -800,7 +800,7 @@ t1000_write_rom_ctl(UNUSED(uint16_t addr), uint8_t val, void *priv)
static uint8_t
t1000_read_rom(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *) priv;
const t1000_t *sys = (t1000_t *) priv;
if (!sys->romdrive)
return 0xff;

2
src/machine/m_xt_t1000_vid.c
View File

@@ -208,7 +208,7 @@ t1000_write(uint32_t addr, uint8_t val, void *priv)
static uint8_t
t1000_read(uint32_t addr, void *priv)
{
t1000_t *t1000 = (t1000_t *) priv;
const t1000_t *t1000 = (t1000_t *) priv;
cycles -= 4;

4
src/machine/machine.c
View File

@@ -143,8 +143,8 @@ machine_init(void)
int
machine_available(int m)
{
int ret;
device_t *dev = (device_t *) machine_get_device(m);
int ret;
const device_t *dev = machine_get_device(m);
bios_only = 1;