|
 |
298366 |
From 2ffbe03e8bc8f330581e31537190949a9aba80c3 Mon Sep 17 00:00:00 2001
|
|
|
298366 |
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
|
|
|
298366 |
Date: Wed, 14 Aug 2013 11:49:04 +0200
|
|
|
298366 |
Subject: [PATCH] adlib: sort offsets in portio registration
|
|
|
298366 |
MIME-Version: 1.0
|
|
|
298366 |
Content-Type: text/plain; charset=UTF-8
|
|
|
298366 |
Content-Transfer-Encoding: 8bit
|
|
|
298366 |
|
|
|
298366 |
This fixes the following assert when -device adlib is used:
|
|
|
298366 |
ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.
|
|
|
298366 |
|
|
|
298366 |
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
|
|
|
298366 |
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
298366 |
(cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca)
|
|
|
298366 |
|
|
|
298366 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
298366 |
---
|
|
|
298366 |
hw/audio/adlib.c | 2 +-
|
|
|
298366 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
298366 |
|
|
|
298366 |
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
|
|
|
298366 |
index 0421d47..db4a953 100644
|
|
|
298366 |
--- a/hw/audio/adlib.c
|
|
|
298366 |
+++ b/hw/audio/adlib.c
|
|
|
298366 |
@@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s)
|
|
|
298366 |
}
|
|
|
298366 |
|
|
|
298366 |
static MemoryRegionPortio adlib_portio_list[] = {
|
|
|
298366 |
- { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
|
298366 |
{ 0, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
|
298366 |
{ 0, 2, 1, .read = adlib_read, .write = adlib_write, },
|
|
|
298366 |
+ { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
|
298366 |
PORTIO_END_OF_LIST(),
|
|
|
298366 |
};
|
|
|
298366 |
|