mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Musicpal ram access cleanup.

Browse Source 
Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7061 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2009-04-10 01:24:26 +00:00
parent 4465449097
commit 930c86820e
1 changed files with 90 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
hw/musicpal.c
View File

@ -72,30 +72,6 @@ static uint32_t gpio_isr;
static uint32_t gpio_out_state; static uint32_t gpio_out_state;
static ram_addr_t sram_off; static ram_addr_t sram_off;
/* Address conversion helpers */
static void *target2host_addr(uint32_t addr)
{
if (addr < MP_SRAM_BASE) {
if (addr >= MP_RAM_DEFAULT_SIZE)
return NULL;
return (void *)(phys_ram_base + addr);
} else {
if (addr >= MP_SRAM_BASE + MP_SRAM_SIZE)
return NULL;
return (void *)(phys_ram_base + sram_off + addr - MP_SRAM_BASE);
}
}
static uint32_t host2target_addr(void *addr)
{
if (addr < ((void *)phys_ram_base) + sram_off)
return (unsigned long)addr - (unsigned long)phys_ram_base;
else
return (unsigned long)addr - (unsigned long)phys_ram_base -
sram_off + MP_SRAM_BASE;
}
typedef enum i2c_state { typedef enum i2c_state {
STOPPED = 0, STOPPED = 0,
INITIALIZING, INITIALIZING,
@ -253,7 +229,7 @@ typedef struct musicpal_audio_state {
uint32_t status; uint32_t status;
uint32_t irq_enable; uint32_t irq_enable;
unsigned long phys_buf; unsigned long phys_buf;
int8_t *target_buffer; uint32_t target_buffer;
unsigned int threshold; unsigned int threshold;
unsigned int play_pos; unsigned int play_pos;
unsigned int last_free; unsigned int last_free;
@ -265,6 +241,7 @@ static void audio_callback(void *opaque, int free_out, int free_in)
{ {
musicpal_audio_state *s = opaque; musicpal_audio_state *s = opaque;
int16_t *codec_buffer; int16_t *codec_buffer;
int8_t buf[4096];
int8_t *mem_buffer; int8_t *mem_buffer;
int pos, block_size; int pos, block_size;
@ -281,7 +258,12 @@ static void audio_callback(void *opaque, int free_out, int free_in)
if (free_out - s->last_free < block_size) if (free_out - s->last_free < block_size)
return; return;
mem_buffer = s->target_buffer + s->play_pos; if (block_size > 4096)
return;
cpu_physical_memory_read(s->target_buffer + s->play_pos, (void *)buf,
block_size);
mem_buffer = buf;
if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) { if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) {
if (s->playback_mode & MP_AUDIO_MONO) { if (s->playback_mode & MP_AUDIO_MONO) {
codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1); codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
@ -399,7 +381,7 @@ static void musicpal_audio_write(void *opaque, target_phys_addr_t offset,
case MP_AUDIO_TX_START_LO: case MP_AUDIO_TX_START_LO:
s->phys_buf = (s->phys_buf & 0xFFFF0000) | (value & 0xFFFF); s->phys_buf = (s->phys_buf & 0xFFFF0000) | (value & 0xFFFF);
s->target_buffer = target2host_addr(s->phys_buf); s->target_buffer = s->phys_buf;
s->play_pos = 0; s->play_pos = 0;
s->last_free = 0; s->last_free = 0;
break; break;
@ -410,7 +392,7 @@ static void musicpal_audio_write(void *opaque, target_phys_addr_t offset,
case MP_AUDIO_TX_START_HI: case MP_AUDIO_TX_START_HI:
s->phys_buf = (s->phys_buf & 0xFFFF) | (value << 16); s->phys_buf = (s->phys_buf & 0xFFFF) | (value << 16);
s->target_buffer = target2host_addr(s->phys_buf); s->target_buffer = s->phys_buf;
s->play_pos = 0; s->play_pos = 0;
s->last_free = 0; s->last_free = 0;
break; break;
@ -555,13 +537,33 @@ typedef struct mv88w8618_eth_state {
uint32_t icr; uint32_t icr;
uint32_t imr; uint32_t imr;
int vlan_header; int vlan_header;
mv88w8618_tx_desc *tx_queue[2]; uint32_t tx_queue[2];
mv88w8618_rx_desc *rx_queue[4]; uint32_t rx_queue[4];
mv88w8618_rx_desc *frx_queue[4]; uint32_t frx_queue[4];
mv88w8618_rx_desc *cur_rx[4]; uint32_t cur_rx[4];
VLANClientState *vc; VLANClientState *vc;
} mv88w8618_eth_state; } mv88w8618_eth_state;
static void eth_rx_desc_put(uint32_t addr, mv88w8618_rx_desc *desc)
{
cpu_to_le32s(&desc->cmdstat);
cpu_to_le16s(&desc->bytes);
cpu_to_le16s(&desc->buffer_size);
cpu_to_le32s(&desc->buffer);
cpu_to_le32s(&desc->next);
cpu_physical_memory_write(addr, (void *)desc, sizeof(*desc));
}
static void eth_rx_desc_get(uint32_t addr, mv88w8618_rx_desc *desc)
{
cpu_physical_memory_read(addr, (void *)desc, sizeof(*desc));
le32_to_cpus(&desc->cmdstat);
le16_to_cpus(&desc->bytes);
le16_to_cpus(&desc->buffer_size);
le32_to_cpus(&desc->buffer);
le32_to_cpus(&desc->next);
}
static int eth_can_receive(void *opaque) static int eth_can_receive(void *opaque)
{ {
return 1; return 1;
@ -570,47 +572,76 @@ static int eth_can_receive(void *opaque)
static void eth_receive(void *opaque, const uint8_t *buf, int size) static void eth_receive(void *opaque, const uint8_t *buf, int size)
{ {
mv88w8618_eth_state *s = opaque; mv88w8618_eth_state *s = opaque;
mv88w8618_rx_desc *desc; uint32_t desc_addr;
mv88w8618_rx_desc desc;
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
desc = s->cur_rx[i]; desc_addr = s->cur_rx[i];
if (!desc) if (!desc_addr)
continue; continue;
do { do {
if (le32_to_cpu(desc->cmdstat) & MP_ETH_RX_OWN && eth_rx_desc_get(desc_addr, &desc);
le16_to_cpu(desc->buffer_size) >= size) { if ((desc.cmdstat & MP_ETH_RX_OWN) && desc.buffer_size >= size) {
memcpy(target2host_addr(le32_to_cpu(desc->buffer) + cpu_physical_memory_write(desc.buffer + s->vlan_header,
s->vlan_header),
buf, size); buf, size);
desc->bytes = cpu_to_le16(size + s->vlan_header); desc.bytes = size + s->vlan_header;
desc->cmdstat &= cpu_to_le32(~MP_ETH_RX_OWN); desc.cmdstat &= ~MP_ETH_RX_OWN;
s->cur_rx[i] = target2host_addr(le32_to_cpu(desc->next)); s->cur_rx[i] = desc.next;
s->icr |= MP_ETH_IRQ_RX; s->icr |= MP_ETH_IRQ_RX;
if (s->icr & s->imr) if (s->icr & s->imr)
qemu_irq_raise(s->irq); qemu_irq_raise(s->irq);
eth_rx_desc_put(desc_addr, &desc);
return; return;
} }
desc = target2host_addr(le32_to_cpu(desc->next)); desc_addr = desc.next;
} while (desc != s->rx_queue[i]); } while (desc_addr != s->rx_queue[i]);
} }
} }
static void eth_tx_desc_put(uint32_t addr, mv88w8618_tx_desc *desc)
{
cpu_to_le32s(&desc->cmdstat);
cpu_to_le16s(&desc->res);
cpu_to_le16s(&desc->bytes);
cpu_to_le32s(&desc->buffer);
cpu_to_le32s(&desc->next);
cpu_physical_memory_write(addr, (void *)desc, sizeof(*desc));
}
static void eth_tx_desc_get(uint32_t addr, mv88w8618_tx_desc *desc)
{
cpu_physical_memory_read(addr, (void *)desc, sizeof(*desc));
le32_to_cpus(&desc->cmdstat);
le16_to_cpus(&desc->res);
le16_to_cpus(&desc->bytes);
le32_to_cpus(&desc->buffer);
le32_to_cpus(&desc->next);
}
static void eth_send(mv88w8618_eth_state *s, int queue_index) static void eth_send(mv88w8618_eth_state *s, int queue_index)
{ {
mv88w8618_tx_desc *desc = s->tx_queue[queue_index]; uint32_t desc_addr = s->tx_queue[queue_index];
mv88w8618_tx_desc desc;
uint8_t buf[2048];
int len;
do { do {
if (le32_to_cpu(desc->cmdstat) & MP_ETH_TX_OWN) { eth_tx_desc_get(desc_addr, &desc);
qemu_send_packet(s->vc, if (desc.cmdstat & MP_ETH_TX_OWN) {
target2host_addr(le32_to_cpu(desc->buffer)), len = desc.bytes;
le16_to_cpu(desc->bytes)); if (len < 2048) {
desc->cmdstat &= cpu_to_le32(~MP_ETH_TX_OWN); cpu_physical_memory_read(desc.buffer, buf, len);
s->icr |= 1 << (MP_ETH_IRQ_TXLO_BIT - queue_index); qemu_send_packet(s->vc, buf, len);
} }
desc = target2host_addr(le32_to_cpu(desc->next)); desc.cmdstat &= ~MP_ETH_TX_OWN;
} while (desc != s->tx_queue[queue_index]); s->icr |= 1 << (MP_ETH_IRQ_TXLO_BIT - queue_index);
eth_tx_desc_put(desc_addr, &desc);
}
desc_addr = desc.next;
} while (desc_addr != s->tx_queue[queue_index]);
} }
static uint32_t mv88w8618_eth_read(void *opaque, target_phys_addr_t offset) static uint32_t mv88w8618_eth_read(void *opaque, target_phys_addr_t offset)
@ -641,13 +672,13 @@ static uint32_t mv88w8618_eth_read(void *opaque, target_phys_addr_t offset)
return s->imr; return s->imr;
case MP_ETH_FRDP0 ... MP_ETH_FRDP3: case MP_ETH_FRDP0 ... MP_ETH_FRDP3:
return host2target_addr(s->frx_queue[(offset - MP_ETH_FRDP0)/4]); return s->frx_queue[(offset - MP_ETH_FRDP0)/4];
case MP_ETH_CRDP0 ... MP_ETH_CRDP3: case MP_ETH_CRDP0 ... MP_ETH_CRDP3:
return host2target_addr(s->rx_queue[(offset - MP_ETH_CRDP0)/4]); return s->rx_queue[(offset - MP_ETH_CRDP0)/4];
case MP_ETH_CTDP0 ... MP_ETH_CTDP3: case MP_ETH_CTDP0 ... MP_ETH_CTDP3:
return host2target_addr(s->tx_queue[(offset - MP_ETH_CTDP0)/4]); return s->tx_queue[(offset - MP_ETH_CTDP0)/4];
default: default:
return 0; return 0;
@ -688,16 +719,16 @@ static void mv88w8618_eth_write(void *opaque, target_phys_addr_t offset,
break; break;
case MP_ETH_FRDP0 ... MP_ETH_FRDP3: case MP_ETH_FRDP0 ... MP_ETH_FRDP3:
s->frx_queue[(offset - MP_ETH_FRDP0)/4] = target2host_addr(value); s->frx_queue[(offset - MP_ETH_FRDP0)/4] = value;
break; break;
case MP_ETH_CRDP0 ... MP_ETH_CRDP3: case MP_ETH_CRDP0 ... MP_ETH_CRDP3:
s->rx_queue[(offset - MP_ETH_CRDP0)/4] = s->rx_queue[(offset - MP_ETH_CRDP0)/4] =
s->cur_rx[(offset - MP_ETH_CRDP0)/4] = target2host_addr(value); s->cur_rx[(offset - MP_ETH_CRDP0)/4] = value;
break; break;
case MP_ETH_CTDP0 ... MP_ETH_CTDP3: case MP_ETH_CTDP0 ... MP_ETH_CTDP3:
s->tx_queue[(offset - MP_ETH_CTDP0)/4] = target2host_addr(value); s->tx_queue[(offset - MP_ETH_CTDP0)/4] = value;
break; break;
} }
} }