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

Merge pull request #2495 from jriwanek-forks/tgui

Browse Source 
Fix crash in TGUI 9440CXI
This commit is contained in:
Miran Grča
2022-07-23 04:04:04 +02:00
committed by GitHub
parent 28d24679e0 d94ae73ef7
commit c069e12948
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/vid_tgui9440.c
View File

@@ -483,7 +483,8 @@ tgui_out(uint16_t addr, uint8_t val, void *p)
break; break;
case 0x37: case 0x37:
i2c_gpio_set(tgui->i2c, (val & 0x02) || !(val & 0x04), (val & 0x01) || !(val & 0x08)); if (tgui->type >= TGUI_9440)
i2c_gpio_set(tgui->i2c, (val & 0x02) || !(val & 0x04), (val & 0x01) || !(val & 0x08));
break; break;
case 0x40: case 0x41: case 0x42: case 0x43: case 0x40: case 0x41: case 0x42: case 0x43:
@@ -609,7 +610,7 @@ tgui_in(uint16_t addr, void *p)
return svga->crtcreg; return svga->crtcreg;
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; temp = svga->crtc[svga->crtcreg];
if (svga->crtcreg == 0x37) { if ((svga->crtcreg == 0x37) && (tgui->type >= TGUI_9440)) {
if (!(temp & 0x04)) { if (!(temp & 0x04)) {
temp &= ~0x02; temp &= ~0x02;
if (i2c_gpio_get_scl(tgui->i2c)) if (i2c_gpio_get_scl(tgui->i2c))
@@ -3150,14 +3151,16 @@ static int tgui96xx_available(void)
void tgui_close(void *p) void tgui_close(void *p)
{ {
tgui_t *tgui = (tgui_t *)p; tgui_t *tgui = (tgui_t *)p;
svga_close(&tgui->svga); svga_close(&tgui->svga);
if (tgui->type >= TGUI_9440) {
ddc_close(tgui->ddc); ddc_close(tgui->ddc);
i2c_gpio_close(tgui->i2c); i2c_gpio_close(tgui->i2c);
};
free(tgui); free(tgui);
} }
void tgui_speed_changed(void *p) void tgui_speed_changed(void *p)