Merge pull request #2495 from jriwanek-forks/tgui

Fix crash in TGUI 9440CXI
This commit is contained in:
Miran Grča
2022-07-23 04:04:04 +02:00
committed by GitHub

View File

@@ -483,6 +483,7 @@ tgui_out(uint16_t addr, uint8_t val, void *p)
break;
case 0x37:
if (tgui->type >= TGUI_9440)
i2c_gpio_set(tgui->i2c, (val & 0x02) || !(val & 0x04), (val & 0x01) || !(val & 0x08));
break;
@@ -609,7 +610,7 @@ tgui_in(uint16_t addr, void *p)
return svga->crtcreg;
case 0x3D5:
temp = svga->crtc[svga->crtcreg];
if (svga->crtcreg == 0x37) {
if ((svga->crtcreg == 0x37) && (tgui->type >= TGUI_9440)) {
if (!(temp & 0x04)) {
temp &= ~0x02;
if (i2c_gpio_get_scl(tgui->i2c))
@@ -3154,8 +3155,10 @@ void tgui_close(void *p)
svga_close(&tgui->svga);
if (tgui->type >= TGUI_9440) {
ddc_close(tgui->ddc);
i2c_gpio_close(tgui->i2c);
};
free(tgui);
}