80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

More linting in src/mem

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-21 20:23:30 -04:00
parent d8eab07471
commit ef41b7c3bf
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mem/mmu_2386.c
View File

@@ -74,7 +74,6 @@ mem_readw_map(uint32_t addr)
{
mem_mapping_t *map = read_mapping[addr >> MEM_GRANULARITY_BITS];
uint16_t ret;
const uint16_t *p;
mem_logical_addr = 0xffffffff;
@@ -93,7 +92,6 @@ mem_readl_map(uint32_t addr)
{
mem_mapping_t *map = read_mapping[addr >> MEM_GRANULARITY_BITS];
uint32_t ret;
const uint32_t *p;
mem_logical_addr = 0xffffffff;
@@ -122,7 +120,6 @@ void
mem_writew_map(uint32_t addr, uint16_t val)
{
mem_mapping_t *map = read_mapping[addr >> MEM_GRANULARITY_BITS];
const uint16_t *p;
mem_logical_addr = 0xffffffff;
@@ -138,7 +135,6 @@ void
mem_writel_map(uint32_t addr, uint32_t val)
{
mem_mapping_t *map = read_mapping[addr >> MEM_GRANULARITY_BITS];
const uint32_t *p;
mem_logical_addr = 0xffffffff;

20
src/mem/sst_flash.c
View File

@@ -465,7 +465,7 @@ sst_add_mappings(sst_t *dev)
static void *
sst_init(const device_t *info)
{
FILE *f;
FILE *fp;
sst_t *dev = malloc(sizeof(sst_t));
memset(dev, 0, sizeof(sst_t));
@@ -493,11 +493,11 @@ sst_init(const device_t *info)
sst_add_mappings(dev);
f = nvr_fopen(flash_path, "rb");
if (f) {
if (fread(&(dev->array[0x00000]), 1, dev->size, f) != dev->size)
fp = nvr_fopen(flash_path, "rb");
if (fp) {
if (fread(&(dev->array[0x00000]), 1, dev->size, fp) != dev->size)
pclog("Less than %i bytes read from the SST Flash ROM file\n", dev->size);
fclose(f);
fclose(fp);
} else
dev->dirty = 1; /* It is by definition dirty on creation. */
@@ -510,14 +510,14 @@ sst_init(const device_t *info)
static void
sst_close(void *priv)
{
FILE *f;
FILE *fp;
sst_t *dev = (sst_t *) priv;
if (dev->dirty) {
f = nvr_fopen(flash_path, "wb");
if (f != NULL) {
fwrite(&(dev->array[0x00000]), dev->size, 1, f);
fclose(f);
fp = nvr_fopen(flash_path, "wb");
if (fp != NULL) {
fwrite(&(dev->array[0x00000]), dev->size, 1, fp);
fclose(fp);
}
}