* Correct numeric value for the RST state.
* Add emulation for reseting a DMA channel.
* Add a few sanity checks.
* Make it compile with debug enabled.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5147
c046a42c-6fe2-441c-8c8c-
71466251a162
STOPPED = 2,
RUNNING = 4
};
STOPPED = 2,
RUNNING = 4
};
saved_data_buf = channel_reg(ctrl, c, RW_SAVED_DATA_BUF);
saved_data_buf = channel_reg(ctrl, c, RW_SAVED_DATA_BUF);
- D(fprintf(logfile, "ch=%d buf=%x after=%x saved_data_buf=%x\n",
+ D(printf("ch=%d buf=%x after=%x saved_data_buf=%x\n",
c,
(uint32_t)ctrl->channels[c].current_d.buf,
(uint32_t)ctrl->channels[c].current_d.after,
c,
(uint32_t)ctrl->channels[c].current_d.buf,
(uint32_t)ctrl->channels[c].current_d.after,
+static void
+dma_update_state(struct fs_dma_ctrl *ctrl, int c)
+{
+ if ((ctrl->channels[c].regs[RW_CFG] & 1) != 3) {
+ if (ctrl->channels[c].regs[RW_CFG] & 2)
+ ctrl->channels[c].state = STOPPED;
+ if (!(ctrl->channels[c].regs[RW_CFG] & 1))
+ ctrl->channels[c].state = RST;
+ }
+}
+
static void
dma_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
{
static void
dma_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
{
case RW_CFG:
ctrl->channels[c].regs[addr] = value;
case RW_CFG:
ctrl->channels[c].regs[addr] = value;
+ dma_update_state(ctrl, c);
break;
case RW_CMD:
/* continue. */
break;
case RW_CMD:
/* continue. */
+ if (value & ~1)
+ printf("Invalid store to ch=%d RW_CMD %x\n",
+ c, value);
ctrl->channels[c].regs[addr] = value;
channel_continue(ctrl, c);
break;
ctrl->channels[c].regs[addr] = value;
channel_continue(ctrl, c);
break;
break;
case RW_STREAM_CMD:
break;
case RW_STREAM_CMD:
+ if (value & ~1023)
+ printf("Invalid store to ch=%d "
+ "RW_STREAMCMD %x\n",
+ c, value);
ctrl->channels[c].regs[addr] = value;
D(printf("stream_cmd ch=%d\n", c));
channel_stream_cmd(ctrl, c, value);
ctrl->channels[c].regs[addr] = value;
D(printf("stream_cmd ch=%d\n", c));
channel_stream_cmd(ctrl, c, value);