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

Gdbstub, Minitrace and more (#2653)

Browse Source 
* Fix gdbstub compilation

* Fix minitrace compilation

* Fix many warnings on Linux Builds

* Support DirectInput for Joysticks in QT UI too
This commit is contained in:
Jasmine Iwanek
2022-08-31 17:35:32 -04:00
committed by GitHub
parent 65fbe568ec
commit 5e0c1ac209
24 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/floppy/fdd_86f.c
View File

@@ -2923,13 +2923,13 @@ d86f_read_track(int drive, int track, int thin_track, int side, uint16_t *da, ui
}
} else
dev->extra_bit_cells[side] = 0;
fread(&(dev->index_hole_pos[side]), 4, 1, dev->f);
(void) !fread(&(dev->index_hole_pos[side]), 4, 1, dev->f);
} else
fseek(dev->f, dev->track_offset[logical_track] + d86f_track_header_size(drive), SEEK_SET);
array_size = d86f_get_array_size(drive, side, 0);
fread(da, 1, array_size, dev->f);
(void) !fread(da, 1, array_size, dev->f);
if (d86f_has_surface_desc(drive))
fread(sa, 1, array_size, dev->f);
(void) !fread(sa, 1, array_size, dev->f);
} else {
if (! thin_track) {
switch((dev->disk_flags >> 1) & 3) {
@@ -3529,7 +3529,7 @@ d86f_load(int drive, char *fn)
len = ftell(dev->f);
fseek(dev->f, 0, SEEK_SET);
fread(&magic, 4, 1, dev->f);
(void) !fread(&magic, 4, 1, dev->f);
if (len < 16) {
/* File is WAY too small, abort. */
@@ -3570,7 +3570,7 @@ d86f_load(int drive, char *fn)
d86f_log("86F: Recognized file version: %i.%02i\n", dev->version >> 8, dev->version & 0xff);
}
fread(&(dev->disk_flags), 2, 1, dev->f);
(void) !fread(&(dev->disk_flags), 2, 1, dev->f);
if (d86f_has_surface_desc(drive)) {
for (i = 0; i < 2; i++)
@@ -3719,7 +3719,7 @@ d86f_load(int drive, char *fn)
fseek(dev->f, 8, SEEK_SET);
fread(dev->track_offset, 1, d86f_get_track_table_size(drive), dev->f);
(void) !fread(dev->track_offset, 1, d86f_get_track_table_size(drive), dev->f);
if (! (dev->track_offset[0])) {
/* File has no track 0 side 0, abort. */

42
src/floppy/fdd_img.c
View File

@@ -684,12 +684,12 @@ img_load(int drive, char *fn)
/* This is a Japanese FDI image, so let's read the header */
img_log("img_load(): File is a Japanese FDI image...\n");
fseek(dev->f, 0x10, SEEK_SET);
(void)fread(&bpb_bps, 1, 2, dev->f);
(void) !fread(&bpb_bps, 1, 2, dev->f);
fseek(dev->f, 0x0C, SEEK_SET);
(void)fread(&size, 1, 4, dev->f);
(void) !fread(&size, 1, 4, dev->f);
bpb_total = size / bpb_bps;
fseek(dev->f, 0x08, SEEK_SET);
(void)fread(&(dev->base), 1, 4, dev->f);
(void) !fread(&(dev->base), 1, 4, dev->f);
fseek(dev->f, dev->base + 0x15, SEEK_SET);
bpb_mid = fgetc(dev->f);
if (bpb_mid < 0xF0)
@@ -729,7 +729,7 @@ img_load(int drive, char *fn)
dev->disk_at_once = 1;
fseek(dev->f, 0x50, SEEK_SET);
(void)fread(&dev->tracks, 1, 4, dev->f);
(void) !fread(&dev->tracks, 1, 4, dev->f);
/* Decode the entire file - pass 1, no write to buffer, determine length. */
fseek(dev->f, 0x80, SEEK_SET);
@@ -740,10 +740,10 @@ img_load(int drive, char *fn)
if (! track_bytes) {
/* Skip first 3 bytes - their meaning is unknown to us but could be a checksum. */
first_byte = fgetc(dev->f);
fread(&track_bytes, 1, 2, dev->f);
(void) !fread(&track_bytes, 1, 2, dev->f);
img_log("Block header: %02X %04X ", first_byte, track_bytes);
/* Read the length of encoded data block. */
fread(&track_bytes, 1, 2, dev->f);
(void) !fread(&track_bytes, 1, 2, dev->f);
img_log("%04X\n", track_bytes);
}
@@ -765,7 +765,7 @@ img_load(int drive, char *fn)
/* Literal. */
track_bytes -= (run & 0x7f);
literal = (uint8_t *)malloc(run & 0x7f);
fread(literal, 1, (run & 0x7f), dev->f);
(void) !fread(literal, 1, (run & 0x7f), dev->f);
free(literal);
}
size += (run & 0x7f);
@@ -775,7 +775,7 @@ img_load(int drive, char *fn)
/* Literal block. */
size += (track_bytes - fdf_suppress_final_byte);
literal = (uint8_t *)malloc(track_bytes);
fread(literal, 1, track_bytes, dev->f);
(void) !fread(literal, 1, track_bytes, dev->f);
free(literal);
track_bytes = 0;
}
@@ -794,10 +794,10 @@ img_load(int drive, char *fn)
if (! track_bytes) {
/* Skip first 3 bytes - their meaning is unknown to us but could be a checksum. */
first_byte = fgetc(dev->f);
fread(&track_bytes, 1, 2, dev->f);
(void) !fread(&track_bytes, 1, 2, dev->f);
img_log("Block header: %02X %04X ", first_byte, track_bytes);
/* Read the length of encoded data block. */
fread(&track_bytes, 1, 2, dev->f);
(void) !fread(&track_bytes, 1, 2, dev->f);
img_log("%04X\n", track_bytes);
}
@@ -824,7 +824,7 @@ img_load(int drive, char *fn)
/* Literal. */
track_bytes -= real_run;
literal = (uint8_t *) malloc(real_run);
fread(literal, 1, real_run, dev->f);
(void) !fread(literal, 1, real_run, dev->f);
if (! track_bytes)
real_run -= fdf_suppress_final_byte;
if (run & 0x7f)
@@ -835,7 +835,7 @@ img_load(int drive, char *fn)
} else {
/* Literal block. */
literal = (uint8_t *) malloc(track_bytes);
fread(literal, 1, track_bytes, dev->f);
(void) !fread(literal, 1, track_bytes, dev->f);
memcpy(bpos, literal, track_bytes - fdf_suppress_final_byte);
free(literal);
bpos += (track_bytes - fdf_suppress_final_byte);
@@ -865,10 +865,10 @@ img_load(int drive, char *fn)
dev->f = plat_fopen(fn, "rb");
fseek(dev->f, 0x03, SEEK_SET);
fread(&bpb_bps, 1, 2, dev->f);
(void) !fread(&bpb_bps, 1, 2, dev->f);
#if 0
fseek(dev->f, 0x0B, SEEK_SET);
fread(&bpb_total, 1, 2, dev->f);
(void) !fread(&bpb_total, 1, 2, dev->f);
#endif
fseek(dev->f, 0x10, SEEK_SET);
bpb_sectors = fgetc(dev->f);
@@ -888,7 +888,7 @@ img_load(int drive, char *fn)
memset(dev->disk_data, 0xf6, ((uint32_t) bpb_total) * ((uint32_t) bpb_bps));
fseek(dev->f, 0x6F, SEEK_SET);
fread(&comment_len, 1, 2, dev->f);
(void) !fread(&comment_len, 1, 2, dev->f);
fseek(dev->f, -1, SEEK_END);
size = ftell(dev->f) + 1;
@@ -898,7 +898,7 @@ img_load(int drive, char *fn)
cur_pos = 0;
while(! feof(dev->f)) {
fread(&block_len, 1, 2, dev->f);
(void) !fread(&block_len, 1, 2, dev->f);
if (! feof(dev->f)) {
if (block_len < 0) {
@@ -915,10 +915,10 @@ img_load(int drive, char *fn)
} else if (block_len > 0) {
if ((cur_pos + block_len) > ((uint32_t) bpb_total) * ((uint32_t) bpb_bps)) {
block_len = ((uint32_t) bpb_total) * ((uint32_t) bpb_bps) - cur_pos;
fread(dev->disk_data + cur_pos, 1, block_len, dev->f);
(void) !fread(dev->disk_data + cur_pos, 1, block_len, dev->f);
break;
} else {
fread(dev->disk_data + cur_pos, 1, block_len, dev->f);
(void) !fread(dev->disk_data + cur_pos, 1, block_len, dev->f);
cur_pos += block_len;
}
}
@@ -939,9 +939,9 @@ img_load(int drive, char *fn)
} else
img_log("img_load(): File is a raw image...\n");
fseek(dev->f, dev->base + 0x0B, SEEK_SET);
fread(&bpb_bps, 1, 2, dev->f);
(void) !fread(&bpb_bps, 1, 2, dev->f);
fseek(dev->f, dev->base + 0x13, SEEK_SET);
fread(&bpb_total, 1, 2, dev->f);
(void) !fread(&bpb_total, 1, 2, dev->f);
fseek(dev->f, dev->base + 0x15, SEEK_SET);
bpb_mid = fgetc(dev->f);
fseek(dev->f, dev->base + 0x18, SEEK_SET);
@@ -1112,7 +1112,7 @@ jump_if_fdf:
/* The image is a Japanese FDI, therefore we read the number of tracks from the header. */
if (fseek(dev->f, 0x1C, SEEK_SET) == -1)
fatal("Japanese FDI: Failed when seeking to 0x1C\n");
fread(&(dev->tracks), 1, 4, dev->f);
(void) !fread(&(dev->tracks), 1, 4, dev->f);
} else {
if (!cqm && !fdf) {
/* Number of tracks = number of total sectors divided by sides times sectors per track. */

2
src/floppy/fdd_td0.c
View File

@@ -645,7 +645,7 @@ td0_initialize(int drive)
}
fseek(dev->f, 0, SEEK_SET);
fread(header, 1, 12, dev->f);
(void) !fread(header, 1, 12, dev->f);
head_count = header[9];
if (header[0] == 't') {