jcs.org
fork of PCE focusing on macplus, supporting DaynaPort SCSI network emulation
lib: Clean up lib/load.c
+16
-20
+14
-19
src/lib/load.c
+14
-19
src/lib/load.c
···
36
36
37
37
int pce_load_blk_bin (mem_blk_t *blk, const char *fname)
38
38
{
39
-
FILE *fp;
40
-
41
-
fp = fopen (fname, "rb");
39
+
FILE *fp;
42
40
43
-
if (fp == NULL) {
41
+
if ((fp = fopen (fname, "rb")) == NULL) {
44
42
return (1);
45
43
}
46
44
···
56
54
int r;
57
55
FILE *fp;
58
56
59
-
fp = fopen (fname, "rb");
60
-
if (fp == NULL) {
57
+
if ((fp = fopen (fname, "r")) == NULL) {
61
58
return (1);
62
59
}
63
60
64
-
r = ihex_load_fp (fp, mem, (ihex_set_f) &mem_set_uint8_rw);
61
+
r = ihex_load_fp (fp, mem, (ihex_set_f) mem_set_uint8_rw);
65
62
66
63
fclose (fp);
67
64
···
73
70
int r;
74
71
FILE *fp;
75
72
76
-
if ((fp = fopen (fname, "rb")) == NULL) {
73
+
if ((fp = fopen (fname, "r")) == NULL) {
77
74
return (1);
78
75
}
79
76
···
89
86
int r;
90
87
FILE *fp;
91
88
92
-
fp = fopen (fname, "rb");
93
-
if (fp == NULL) {
89
+
if ((fp = fopen (fname, "r")) == NULL) {
94
90
return (1);
95
91
}
96
92
97
-
r = srec_load_fp (fp, mem, (ihex_set_f) &mem_set_uint8_rw);
93
+
r = srec_load_fp (fp, mem, (ihex_set_f) mem_set_uint8_rw);
98
94
99
95
fclose (fp);
100
96
101
97
return (r);
102
98
}
103
99
104
-
int pce_load_mem_bin (memory_t *mem, const char *fname, unsigned long base)
100
+
int pce_load_mem_bin (memory_t *mem, const char *fname, unsigned long addr)
105
101
{
106
102
int c;
107
103
FILE *fp;
108
104
109
-
fp = fopen (fname, "rb");
110
-
if (fp == NULL) {
105
+
if ((fp = fopen (fname, "r")) == NULL) {
111
106
return (1);
112
107
}
113
108
114
-
c = fgetc (fp);
115
-
while (c != EOF) {
116
-
mem_set_uint8_rw (mem, base, c & 0xff);
117
-
base += 1;
118
-
c = fgetc (fp);
109
+
while ((c = fgetc (fp)) != EOF) {
110
+
mem_set_uint8_rw (mem, addr, c & 0xff);
111
+
addr += 1;
119
112
}
120
113
121
114
fclose (fp);
···
189
182
r = 0;
190
183
191
184
sct = NULL;
185
+
192
186
while ((sct = ini_next_sct (ini, sct, "load")) != NULL) {
193
187
ini_get_string (sct, "format", &fmt, "binary");
194
188
ini_get_string (sct, "file", &fname, NULL);
189
+
195
190
if (ini_get_uint32 (sct, "address", &addr, 0)) {
196
191
ini_get_uint32 (sct, "base", &addr, 0);
197
192
}
+2
-1
src/lib/load.h
+2
-1
src/lib/load.h
···
5
5
/*****************************************************************************
6
6
* File name: src/lib/load.h *
7
7
* Created: 2004-08-02 by Hampa Hug <hampa@hampa.ch> *
8
-
* Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> *
8
+
* Copyright: (C) 2004-2020 Hampa Hug <hampa@hampa.ch> *
9
9
*****************************************************************************/
10
10
11
11
/*****************************************************************************
···
32
32
int pce_load_blk_bin (mem_blk_t *blk, const char *fname);
33
33
34
34
int pce_load_mem_ihex (memory_t *mem, const char *fname);
35
+
int pce_load_mem_mhex (memory_t *mem, const char *fname);
35
36
int pce_load_mem_srec (memory_t *mem, const char *fname);
36
37
int pce_load_mem_bin (memory_t *mem, const char *fname, unsigned long base);
37
38