a9338ea4ce
* Many bug fixes and improvements * Add LatticeMico32 and unicore32 targets are added. * And many changes. See http://wiki.qemu.org/ChangeLog/0.15 Tested on NetBSD/i386 current, NetBSD/i386 5.1, DragonFly/i386 2.10.1, and Gentoo Linux/i386.
30 lines
1.4 KiB
Text
30 lines
1.4 KiB
Text
$NetBSD: patch-eh,v 1.3 2011/08/22 12:00:34 ryoon Exp $
|
|
|
|
Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
|
|
(PR lib/43832: ssp causes common names to be defines)
|
|
|
|
--- hw/omap_dss.c.orig 2011-08-08 18:28:42 +0000
|
|
+++ hw/omap_dss.c
|
|
@@ -774,18 +774,18 @@ static void omap_rfbi_write(void *opaque
|
|
break;
|
|
case 0x58: /* RFBI_READ */
|
|
if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
|
|
- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1);
|
|
+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 1);
|
|
else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1])
|
|
- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1);
|
|
+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 1);
|
|
if (!-- s->rfbi.pixels)
|
|
omap_rfbi_transfer_stop(s);
|
|
break;
|
|
|
|
case 0x5c: /* RFBI_STATUS */
|
|
if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
|
|
- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0);
|
|
+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 0);
|
|
else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1])
|
|
- s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0);
|
|
+ s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 0);
|
|
if (!-- s->rfbi.pixels)
|
|
omap_rfbi_transfer_stop(s);
|
|
break;
|