commit 292eef5acb679a65c5f0fbdee65fb372263d50da
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Feb 19 00:59:34 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Feb 19 00:59:34 2007 +0000
tree 16567ad392dc646b72ba8358c8f1d2d4190f20e5
parent 43523e9332e79a8ecbcec8444f975b8a705aa9d3

Ignore special flags in nsector variable.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2436 c046a42c-6fe2-441c-8c8c-71466251a162

hw/ide.c

diff --git a/hw/ide.c b/hw/ide.c
index 190f074..9e5451f 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -794,7 +794,7 @@
     ret = bdrv_write(s->bs, sector_num, s->io_buffer, n);
     s->nsector -= n;
     if (s->nsector == 0) {
-        /* no more sector to write */
+        /* no more sectors to write */
         ide_transfer_stop(s);
     } else {
         n1 = s->nsector;
@@ -1631,12 +1631,12 @@
             ide_set_irq(s);
             break;
         case WIN_SETMULT:
-            if (s->nsector > MAX_MULT_SECTORS || 
+            if ((s->nsector & 0xff) > MAX_MULT_SECTORS ||
                 s->nsector == 0 ||
                 (s->nsector & (s->nsector - 1)) != 0) {
                 ide_abort_command(s);
             } else {
-                s->mult_sectors = s->nsector;
+                s->mult_sectors = s->nsector & 0xff;
                 s->status = READY_STAT;
             }
             ide_set_irq(s);