2009-07-02 12:32:06 +02:00
|
|
|
/*
|
|
|
|
* QEMU System Emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* splitted out ioport related stuffs from vl.c.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ioport.h"
|
2010-08-11 13:45:11 +02:00
|
|
|
#include "trace.h"
|
2009-07-02 12:32:06 +02:00
|
|
|
|
|
|
|
/***********************************************************/
|
|
|
|
/* IO Port */
|
|
|
|
|
|
|
|
//#define DEBUG_UNUSED_IOPORT
|
|
|
|
//#define DEBUG_IOPORT
|
|
|
|
|
2009-07-14 12:10:42 +02:00
|
|
|
#ifdef DEBUG_UNUSED_IOPORT
|
|
|
|
# define LOG_UNUSED_IOPORT(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
|
|
|
|
#else
|
|
|
|
# define LOG_UNUSED_IOPORT(fmt, ...) do{ } while (0)
|
|
|
|
#endif
|
|
|
|
|
2009-07-02 12:32:06 +02:00
|
|
|
#ifdef DEBUG_IOPORT
|
|
|
|
# define LOG_IOPORT(...) qemu_log_mask(CPU_LOG_IOPORT, ## __VA_ARGS__)
|
|
|
|
#else
|
|
|
|
# define LOG_IOPORT(...) do { } while (0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* XXX: use a two level table to limit memory usage */
|
|
|
|
|
|
|
|
static void *ioport_opaque[MAX_IOPORTS];
|
|
|
|
static IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS];
|
|
|
|
static IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
|
|
|
|
|
|
|
|
static IOPortReadFunc default_ioport_readb, default_ioport_readw, default_ioport_readl;
|
|
|
|
static IOPortWriteFunc default_ioport_writeb, default_ioport_writew, default_ioport_writel;
|
|
|
|
|
|
|
|
static uint32_t ioport_read(int index, uint32_t address)
|
|
|
|
{
|
2009-09-06 18:32:13 +02:00
|
|
|
static IOPortReadFunc * const default_func[3] = {
|
2009-07-02 12:32:06 +02:00
|
|
|
default_ioport_readb,
|
|
|
|
default_ioport_readw,
|
|
|
|
default_ioport_readl
|
|
|
|
};
|
|
|
|
IOPortReadFunc *func = ioport_read_table[index][address];
|
|
|
|
if (!func)
|
|
|
|
func = default_func[index];
|
|
|
|
return func(ioport_opaque[address], address);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ioport_write(int index, uint32_t address, uint32_t data)
|
|
|
|
{
|
2009-09-06 18:32:13 +02:00
|
|
|
static IOPortWriteFunc * const default_func[3] = {
|
2009-07-02 12:32:06 +02:00
|
|
|
default_ioport_writeb,
|
|
|
|
default_ioport_writew,
|
|
|
|
default_ioport_writel
|
|
|
|
};
|
|
|
|
IOPortWriteFunc *func = ioport_write_table[index][address];
|
|
|
|
if (!func)
|
|
|
|
func = default_func[index];
|
|
|
|
func(ioport_opaque[address], address, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t default_ioport_readb(void *opaque, uint32_t address)
|
|
|
|
{
|
2009-07-14 12:10:42 +02:00
|
|
|
LOG_UNUSED_IOPORT("unused inb: port=0x%04"PRIx32"\n", address);
|
2009-07-02 12:32:06 +02:00
|
|
|
return 0xff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void default_ioport_writeb(void *opaque, uint32_t address, uint32_t data)
|
|
|
|
{
|
2009-07-14 12:10:42 +02:00
|
|
|
LOG_UNUSED_IOPORT("unused outb: port=0x%04"PRIx32" data=0x%02"PRIx32"\n",
|
|
|
|
address, data);
|
2009-07-02 12:32:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* default is to make two byte accesses */
|
|
|
|
static uint32_t default_ioport_readw(void *opaque, uint32_t address)
|
|
|
|
{
|
|
|
|
uint32_t data;
|
|
|
|
data = ioport_read(0, address);
|
2009-07-02 12:32:07 +02:00
|
|
|
address = (address + 1) & IOPORTS_MASK;
|
2009-07-02 12:32:06 +02:00
|
|
|
data |= ioport_read(0, address) << 8;
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void default_ioport_writew(void *opaque, uint32_t address, uint32_t data)
|
|
|
|
{
|
|
|
|
ioport_write(0, address, data & 0xff);
|
2009-07-02 12:32:07 +02:00
|
|
|
address = (address + 1) & IOPORTS_MASK;
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_write(0, address, (data >> 8) & 0xff);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t default_ioport_readl(void *opaque, uint32_t address)
|
|
|
|
{
|
2009-07-14 12:10:42 +02:00
|
|
|
LOG_UNUSED_IOPORT("unused inl: port=0x%04"PRIx32"\n", address);
|
2009-07-02 12:32:06 +02:00
|
|
|
return 0xffffffff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void default_ioport_writel(void *opaque, uint32_t address, uint32_t data)
|
|
|
|
{
|
2009-07-14 12:10:42 +02:00
|
|
|
LOG_UNUSED_IOPORT("unused outl: port=0x%04"PRIx32" data=0x%02"PRIx32"\n",
|
|
|
|
address, data);
|
2009-07-02 12:32:06 +02:00
|
|
|
}
|
|
|
|
|
2009-07-02 12:32:08 +02:00
|
|
|
static int ioport_bsize(int size, int *bsize)
|
|
|
|
{
|
|
|
|
if (size == 1) {
|
|
|
|
*bsize = 0;
|
|
|
|
} else if (size == 2) {
|
|
|
|
*bsize = 1;
|
|
|
|
} else if (size == 4) {
|
|
|
|
*bsize = 2;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-02 12:32:06 +02:00
|
|
|
/* size is the word size in byte */
|
2009-10-01 23:12:16 +02:00
|
|
|
int register_ioport_read(pio_addr_t start, int length, int size,
|
2009-07-02 12:32:06 +02:00
|
|
|
IOPortReadFunc *func, void *opaque)
|
|
|
|
{
|
|
|
|
int i, bsize;
|
|
|
|
|
2009-07-02 12:32:08 +02:00
|
|
|
if (ioport_bsize(size, &bsize)) {
|
2009-07-02 12:32:06 +02:00
|
|
|
hw_error("register_ioport_read: invalid size");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for(i = start; i < start + length; i += size) {
|
|
|
|
ioport_read_table[bsize][i] = func;
|
|
|
|
if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque)
|
2011-03-06 15:48:13 +01:00
|
|
|
hw_error("register_ioport_read: invalid opaque for address 0x%x",
|
|
|
|
i);
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_opaque[i] = opaque;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* size is the word size in byte */
|
2009-10-01 23:12:16 +02:00
|
|
|
int register_ioport_write(pio_addr_t start, int length, int size,
|
2009-07-02 12:32:06 +02:00
|
|
|
IOPortWriteFunc *func, void *opaque)
|
|
|
|
{
|
|
|
|
int i, bsize;
|
|
|
|
|
2009-07-02 12:32:08 +02:00
|
|
|
if (ioport_bsize(size, &bsize)) {
|
2009-07-02 12:32:06 +02:00
|
|
|
hw_error("register_ioport_write: invalid size");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for(i = start; i < start + length; i += size) {
|
|
|
|
ioport_write_table[bsize][i] = func;
|
|
|
|
if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque)
|
2011-03-06 15:48:13 +01:00
|
|
|
hw_error("register_ioport_write: invalid opaque for address 0x%x",
|
|
|
|
i);
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_opaque[i] = opaque;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-11-17 10:50:09 +01:00
|
|
|
static uint32_t ioport_readb_thunk(void *opaque, uint32_t addr)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
uint64_t data;
|
|
|
|
|
|
|
|
ioport->ops->read(ioport, addr - ioport->base, 1, &data);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t ioport_readw_thunk(void *opaque, uint32_t addr)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
uint64_t data;
|
|
|
|
|
|
|
|
ioport->ops->read(ioport, addr - ioport->base, 2, &data);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t ioport_readl_thunk(void *opaque, uint32_t addr)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
uint64_t data;
|
|
|
|
|
|
|
|
ioport->ops->read(ioport, addr - ioport->base, 4, &data);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ioport_writeb_thunk(void *opaque, uint32_t addr, uint32_t data)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
|
|
|
|
ioport->ops->write(ioport, addr - ioport->base, 1, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ioport_writew_thunk(void *opaque, uint32_t addr, uint32_t data)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
|
|
|
|
ioport->ops->write(ioport, addr - ioport->base, 2, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ioport_writel_thunk(void *opaque, uint32_t addr, uint32_t data)
|
|
|
|
{
|
|
|
|
IORange *ioport = opaque;
|
|
|
|
|
|
|
|
ioport->ops->write(ioport, addr - ioport->base, 4, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ioport_register(IORange *ioport)
|
|
|
|
{
|
|
|
|
register_ioport_read(ioport->base, ioport->len, 1,
|
|
|
|
ioport_readb_thunk, ioport);
|
|
|
|
register_ioport_read(ioport->base, ioport->len, 2,
|
|
|
|
ioport_readw_thunk, ioport);
|
|
|
|
register_ioport_read(ioport->base, ioport->len, 4,
|
|
|
|
ioport_readl_thunk, ioport);
|
|
|
|
register_ioport_write(ioport->base, ioport->len, 1,
|
|
|
|
ioport_writeb_thunk, ioport);
|
|
|
|
register_ioport_write(ioport->base, ioport->len, 2,
|
|
|
|
ioport_writew_thunk, ioport);
|
|
|
|
register_ioport_write(ioport->base, ioport->len, 4,
|
|
|
|
ioport_writel_thunk, ioport);
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
void isa_unassign_ioport(pio_addr_t start, int length)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = start; i < start + length; i++) {
|
|
|
|
ioport_read_table[0][i] = default_ioport_readb;
|
|
|
|
ioport_read_table[1][i] = default_ioport_readw;
|
|
|
|
ioport_read_table[2][i] = default_ioport_readl;
|
|
|
|
|
|
|
|
ioport_write_table[0][i] = default_ioport_writeb;
|
|
|
|
ioport_write_table[1][i] = default_ioport_writew;
|
|
|
|
ioport_write_table[2][i] = default_ioport_writel;
|
|
|
|
|
|
|
|
ioport_opaque[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************/
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
void cpu_outb(pio_addr_t addr, uint8_t val)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_out(addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_write(0, addr, val);
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
void cpu_outw(pio_addr_t addr, uint16_t val)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("outw: %04"FMT_pioaddr" %04"PRIx16"\n", addr, val);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_out(addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_write(1, addr, val);
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
void cpu_outl(pio_addr_t addr, uint32_t val)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("outl: %04"FMT_pioaddr" %08"PRIx32"\n", addr, val);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_out(addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
ioport_write(2, addr, val);
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
uint8_t cpu_inb(pio_addr_t addr)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
uint8_t val;
|
2009-07-02 12:32:06 +02:00
|
|
|
val = ioport_read(0, addr);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_in(addr, val);
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("inb : %04"FMT_pioaddr" %02"PRIx8"\n", addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
uint16_t cpu_inw(pio_addr_t addr)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
uint16_t val;
|
2009-07-02 12:32:06 +02:00
|
|
|
val = ioport_read(1, addr);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_in(addr, val);
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("inw : %04"FMT_pioaddr" %04"PRIx16"\n", addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2009-10-01 23:12:16 +02:00
|
|
|
uint32_t cpu_inl(pio_addr_t addr)
|
2009-07-02 12:32:06 +02:00
|
|
|
{
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
uint32_t val;
|
2009-07-02 12:32:06 +02:00
|
|
|
val = ioport_read(2, addr);
|
2010-08-11 13:45:11 +02:00
|
|
|
trace_cpu_in(addr, val);
|
ioport: use uint{32, 16, 8}_t for ioport value and pio_addr_t for ioport address.
Using int for cpu_{in, out}[bwl] is inconsistent with other part
because for address or value, uintN_t is used by other qemu part.
At least, softmmu, CPU{Read, Write}MemoryFunc, pci, target_phys_addr_t
and the callers of cpu_{in, out}[bwl]().
This patch removes the inconsistency.
IO port has its own address space so define pio_addr_t as uint32_t
because PCI io space width is 32bit.
And use uint{32, 16, 8}_t for ioport value.
Changing signedness of value might cause subtle issue. However
only a suspicious caller is kvm_handle_io() which is ok. And other callers
pass unsigned value in the first place.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Stuart Brady <sdbrady@ntlworld.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Cc: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-07-14 12:10:43 +02:00
|
|
|
LOG_IOPORT("inl : %04"FMT_pioaddr" %08"PRIx32"\n", addr, val);
|
2009-07-02 12:32:06 +02:00
|
|
|
return val;
|
|
|
|
}
|