aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 08:18:36 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 08:18:36 +0000
commit687fa640d49ce19b9b9a2258fde19e1500bfabb4 (patch)
treef835f5923fdf8a4592176d9630978c411e082834 /hw
parentd34cab9f49bc3ad83a2a968fc2d2719179db2c15 (diff)
Random bug fixes from code inspection, by Wang Cheng Yeh.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2580 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/lsi53c895a.c1
-rw-r--r--hw/smc91c111.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 07e09f3cc8..193ff12204 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -1046,6 +1046,7 @@ again:
case 5: /* SHR */
op1 = op0 & 1;
op0 = (op0 >> 1) | (s->carry << 7);
+ s->carry = op1;
break;
case 6: /* ADD */
op0 += op1;
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index 0249cfe98b..855a9b1f1d 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -446,7 +446,9 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
case 7:
/* Not implemented. */
return 0;
- case 8: /* Free memory available. */
+ case 8: /* Memory size. */
+ return NUM_PACKETS;
+ case 9: /* Free memory available. */
{
int i;
int n;
@@ -457,8 +459,6 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
}
return n;
}
- case 9: /* Memory size. */
- return NUM_PACKETS;
case 10: case 11: /* RPCR */
/* Not implemented. */
return 0;