claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

12
src/mem/catalyst_flash.c
View File

@@ -70,8 +70,8 @@ static char flash_path[1024];
static uint8_t
flash_read(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint8_t ret = 0xff;
const flash_t *dev = (flash_t *) priv;
uint8_t ret = 0xff;
addr &= biosmask;
@@ -100,8 +100,8 @@ flash_read(uint32_t addr, void *priv)
static uint16_t
flash_readw(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint16_t *q;
flash_t *dev = (flash_t *) priv;
const uint16_t *q;
addr &= biosmask;
@@ -113,8 +113,8 @@ flash_readw(uint32_t addr, void *priv)
static uint32_t
flash_readl(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint32_t *q;
flash_t *dev = (flash_t *) priv;
const uint32_t *q;
addr &= biosmask;

14
src/mem/intel_flash.c
View File

@@ -81,8 +81,8 @@ static char flash_path[1024];
static uint8_t
flash_read(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint8_t ret = 0xff;
const flash_t *dev = (flash_t *) priv;
uint8_t ret = 0xff;
if (dev->flags & FLAG_INV_A16)
addr ^= 0x10000;
@@ -112,9 +112,9 @@ flash_read(uint32_t addr, void *priv)
static uint16_t
flash_readw(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint16_t *q;
uint16_t ret = 0xffff;
flash_t *dev = (flash_t *) priv;
const uint16_t *q;
uint16_t ret = 0xffff;
if (dev->flags & FLAG_INV_A16)
addr ^= 0x10000;
@@ -150,8 +150,8 @@ flash_readw(uint32_t addr, void *priv)
static uint32_t
flash_readl(uint32_t addr, void *priv)
{
flash_t *dev = (flash_t *) priv;
uint32_t *q;
flash_t *dev = (flash_t *) priv;
const uint32_t *q;
if (dev->flags & FLAG_INV_A16)
addr ^= 0x10000;

22
src/mem/mem.c
View File

@@ -162,7 +162,7 @@ mem_log(const char *fmt, ...)
int
mem_addr_is_ram(uint32_t addr)
{
mem_mapping_t *mapping = read_mapping[addr >> MEM_GRANULARITY_BITS];
const mem_mapping_t *mapping = read_mapping[addr >> MEM_GRANULARITY_BITS];
return (mapping == &ram_low_mapping) || (mapping == &ram_high_mapping) || (mapping == &ram_mid_mapping) ||
(mapping == &ram_mid_mapping2) || (mapping == &ram_remapped_mapping);
@@ -242,7 +242,7 @@ flushmmucache_nopc(void)
void
mem_flush_write_page(uint32_t addr, uint32_t virt)
{
page_t *page_target = &pages[addr >> 12];
const page_t *page_target = &pages[addr >> 12];
#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
uint32_t a;
#endif
@@ -1643,9 +1643,9 @@ mem_readb_phys(uint32_t addr)
uint16_t
mem_readw_phys(uint32_t addr)
{
mem_mapping_t *map = read_mapping_bus[addr >> MEM_GRANULARITY_BITS];
uint16_t ret;
uint16_t *p;
mem_mapping_t *map = read_mapping_bus[addr >> MEM_GRANULARITY_BITS];
uint16_t ret;
const uint16_t *p;
mem_logical_addr = 0xffffffff;
@@ -1665,9 +1665,9 @@ mem_readw_phys(uint32_t addr)
uint32_t
mem_readl_phys(uint32_t addr)
{
mem_mapping_t *map = read_mapping_bus[addr >> MEM_GRANULARITY_BITS];
uint32_t ret;
uint32_t *p;
mem_mapping_t *map = read_mapping_bus[addr >> MEM_GRANULARITY_BITS];
uint32_t ret;
const uint32_t *p;
mem_logical_addr = 0xffffffff;
@@ -1759,9 +1759,9 @@ mem_writel_phys(uint32_t addr, uint32_t val)
void
mem_write_phys(void *src, uint32_t addr, int transfer_size)
{
uint8_t *pb;
uint16_t *pw;
uint32_t *pl;
const uint8_t *pb;
const uint16_t *pw;
const uint32_t *pl;
if (transfer_size == 4) {
pl = (uint32_t *) src;

4
src/mem/rom.c
View File

@@ -138,7 +138,7 @@ rom_getfile(char *fn, char *s, int size)
}
int
rom_present(char *fn)
rom_present(const char *fn)
{
FILE *fp;
@@ -154,7 +154,7 @@ rom_present(char *fn)
uint8_t
rom_read(uint32_t addr, void *priv)
{
rom_t *rom = (rom_t *) priv;
const rom_t *rom = (rom_t *) priv;
#ifdef ROM_TRACE
if (rom->mapping.base == ROM_TRACE)

16
src/mem/row.c
View File

@@ -44,8 +44,8 @@ static row_t *rows;
static uint8_t
row_read(uint32_t addr, void *priv)
{
row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
const row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
addreadlookup(mem_logical_addr, new_addr);
@@ -80,8 +80,8 @@ row_readl(uint32_t addr, void *priv)
static void
row_write(uint32_t addr, uint8_t val, void *priv)
{
row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
const row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
addwritelookup(mem_logical_addr, new_addr);
mem_write_ramb_page(new_addr, val, &pages[addr >> 12]);
@@ -91,8 +91,8 @@ row_write(uint32_t addr, uint8_t val, void *priv)
static void
row_writew(uint32_t addr, uint16_t val, void *priv)
{
row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
const row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
addwritelookup(mem_logical_addr, new_addr);
mem_write_ramw_page(new_addr, val, &pages[addr >> 12]);
@@ -102,8 +102,8 @@ row_writew(uint32_t addr, uint16_t val, void *priv)
static void
row_writel(uint32_t addr, uint32_t val, void *priv)
{
row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
const row_t *dev = (row_t *) priv;
uint32_t new_addr = ((addr - dev->host_base) & dev->ram_mask) + dev->ram_base;
addwritelookup(mem_logical_addr, new_addr);
mem_write_raml_page(new_addr, val, &pages[addr >> 12]);

4
src/mem/smram.c
View File

@@ -56,8 +56,8 @@ smram_log(const char *fmt, ...)
static uint8_t
smram_read(uint32_t addr, void *priv)
{
smram_t *dev = (smram_t *) priv;
uint32_t new_addr = addr - dev->host_base + dev->ram_base;
const smram_t *dev = (smram_t *) priv;
uint32_t new_addr = addr - dev->host_base + dev->ram_base;
if (new_addr >= (1 << 30))
return mem_read_ram_2gb(new_addr, priv);

4
src/mem/spd.c
View File

@@ -85,8 +85,8 @@ spd_init(UNUSED(const device_t *info))
int
comp_ui16_rev(const void *elem1, const void *elem2)
{
uint16_t a = *((uint16_t *) elem1);
uint16_t b = *((uint16_t *) elem2);
const uint16_t a = *((const uint16_t *) elem1);
const uint16_t b = *((const uint16_t *) elem2);
return ((a > b) ? -1 : ((a < b) ? 1 : 0));
}

8
src/mem/sst_flash.c
View File

@@ -264,8 +264,8 @@ sst_page_write(void *priv)
static uint8_t
sst_read_id(uint32_t addr, void *priv)
{
sst_t *dev = (sst_t *) priv;
uint8_t ret = 0x00;
const sst_t *dev = (sst_t *) priv;
uint8_t ret = 0x00;
if ((addr & 0xffff) == 0)
ret = dev->manufacturer;
@@ -378,8 +378,8 @@ sst_write(uint32_t addr, uint8_t val, void *priv)
static uint8_t
sst_read(uint32_t addr, void *priv)
{
sst_t *dev = (sst_t *) priv;
uint8_t ret = 0xff;
const sst_t *dev = (sst_t *) priv;
uint8_t ret = 0xff;
addr &= 0x000fffff;