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

Fix SMBus-related reset crashes

Browse Source
This commit is contained in:
RichardG867
2020-08-12 00:02:23 -03:00
parent 23a606491f
commit 070c898dfe
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/hwm_lm75.c
View File

@@ -64,7 +64,7 @@ lm75_remap(lm75_t *dev, uint8_t addr)
{ {
lm75_log("LM75: remapping to SMBus %02Xh\n", addr); lm75_log("LM75: remapping to SMBus %02Xh\n", addr);
smbus_removehandler(dev->smbus_addr, 1, if (dev->smbus_addr < 0x80) smbus_removehandler(dev->smbus_addr, 1,
lm75_smbus_read_byte, lm75_smbus_read_byte_cmd, lm75_smbus_read_word_cmd, NULL, lm75_smbus_read_byte, lm75_smbus_read_byte_cmd, lm75_smbus_read_word_cmd, NULL,
lm75_smbus_write_byte, lm75_smbus_write_byte_cmd, lm75_smbus_write_word_cmd, NULL, lm75_smbus_write_byte, lm75_smbus_write_byte_cmd, lm75_smbus_write_word_cmd, NULL,
dev); dev);

11
src/device/smbus.c
View File

@@ -115,6 +115,9 @@ smbus_sethandler(uint8_t base, int size,
int c; int c;
smbus_t *p, *q = NULL; smbus_t *p, *q = NULL;
if ((base + size) >= NADDRS)
return;
for (c = 0; c < size; c++) { for (c = 0; c < size; c++) {
p = smbus_last[base + c]; p = smbus_last[base + c];
q = (smbus_t *) malloc(sizeof(smbus_t)); q = (smbus_t *) malloc(sizeof(smbus_t));
@@ -158,13 +161,17 @@ smbus_removehandler(uint8_t base, int size,
void *priv) void *priv)
{ {
int c; int c;
smbus_t *p; smbus_t *p, *q;
if ((base + size) >= NADDRS)
return;
for (c = 0; c < size; c++) { for (c = 0; c < size; c++) {
p = smbus[base + c]; p = smbus[base + c];
if (!p) if (!p)
continue; continue;
while(p) { while(p) {
q = p->next;
if ((p->read_byte == read_byte) && (p->read_byte_cmd == read_byte_cmd) && if ((p->read_byte == read_byte) && (p->read_byte_cmd == read_byte_cmd) &&
(p->read_word_cmd == read_word_cmd) && (p->read_block_cmd == read_block_cmd) && (p->read_word_cmd == read_word_cmd) && (p->read_block_cmd == read_block_cmd) &&
(p->write_byte == write_byte) && (p->write_byte_cmd == write_byte_cmd) && (p->write_byte == write_byte) && (p->write_byte_cmd == write_byte_cmd) &&
@@ -182,7 +189,7 @@ smbus_removehandler(uint8_t base, int size,
p = NULL; p = NULL;
break; break;
} }
p = p->next; p = q;
} }
} }
} }