diff options
author | 2010-01-06 17:08:04 +0100 | |
---|---|---|
committer | 2010-04-18 22:02:03 +0200 | |
commit | 3b4bef06969e42bdb929284ecff1dfb41d1b4aed (patch) | |
tree | 9aae22ca75bf42346b0f65b19929109f4d8e69bb | |
parent | lsi: move dma_len+dma_buf into lsi_request (diff) | |
download | qemu-kvm-3b4bef06969e42bdb929284ecff1dfb41d1b4aed.tar.gz qemu-kvm-3b4bef06969e42bdb929284ecff1dfb41d1b4aed.tar.bz2 qemu-kvm-3b4bef06969e42bdb929284ecff1dfb41d1b4aed.zip |
lsi: pass lsi_request to lsi_reselect
All callers of lsi_reselect have a lsi_request struct at hand anyway.
So just pass it directly instead of having lsi_reselect search for it
using the tag.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit aa4d32c4742e62e09786bd1067a5b98239867e93)
-rw-r--r-- | hw/lsi53c895a.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index c43ed2323..872106d1e 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -371,7 +371,7 @@ static int lsi_dma_64bit(LSIState *s) static uint8_t lsi_reg_readb(LSIState *s, int offset); static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val); static void lsi_execute_script(LSIState *s); -static void lsi_reselect(LSIState *s, uint32_t tag); +static void lsi_reselect(LSIState *s, lsi_request *p); static inline uint32_t read_dword(LSIState *s, uint32_t addr) { @@ -430,7 +430,7 @@ static void lsi_update_irq(LSIState *s) "processes\n"); QTAILQ_FOREACH(p, &s->queue, next) { if (p->pending) { - lsi_reselect(s, p->tag); + lsi_reselect(s, p); break; } } @@ -589,24 +589,15 @@ static void lsi_add_msg_byte(LSIState *s, uint8_t data) } /* Perform reselection to continue a command. */ -static void lsi_reselect(LSIState *s, uint32_t tag) +static void lsi_reselect(LSIState *s, lsi_request *p) { - lsi_request *p; int id; - QTAILQ_FOREACH(p, &s->queue, next) { - if (p->tag == tag) - break; - } - if (p == NULL) { - BADF("Reselected non-existant command tag=0x%x\n", tag); - return; - } assert(s->current == NULL); QTAILQ_REMOVE(&s->queue, p, next); s->current = p; - id = (tag >> 8) & 0xf; + id = (p->tag >> 8) & 0xf; s->ssid = id | 0x80; /* LSI53C700 Family Compatibility, see LSI53C895A 4-73 */ if (!s->dcntl & LSI_DCNTL_COM) { @@ -620,7 +611,7 @@ static void lsi_reselect(LSIState *s, uint32_t tag) lsi_add_msg_byte(s, 0x80); if (s->current->tag & LSI_TAG_VALID) { lsi_add_msg_byte(s, 0x20); - lsi_add_msg_byte(s, tag & 0xff); + lsi_add_msg_byte(s, p->tag & 0xff); } if (lsi_irq_on_rsl(s)) { @@ -649,7 +640,7 @@ static int lsi_queue_tag(LSIState *s, uint32_t tag, uint32_t arg) (lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON) && !(s->istat0 & (LSI_ISTAT0_SIP | LSI_ISTAT0_DIP)))) { /* Reselect device. */ - lsi_reselect(s, tag); + lsi_reselect(s, p); return 0; } else { DPRINTF("Queueing IO tag=0x%x\n", tag); @@ -914,7 +905,7 @@ static void lsi_wait_reselect(LSIState *s) QTAILQ_FOREACH(p, &s->queue, next) { if (p->pending) { - lsi_reselect(s, p->tag); + lsi_reselect(s, p); break; } } |