From: Ben Gras <ben@minix3.org>
Date: Fri, 23 Feb 2007 20:53:32 +0000 (+0000)
Subject: Explicitly mask off 8-bit values (so new sanity check doesn't trip)
X-Git-Tag: v3.1.3~56
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=92e57afdf31536d0552cd12f689d19ad2c031b40;p=minix.git

Explicitly mask off 8-bit values (so new sanity check doesn't trip)
---

diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c
index eefbb4361..9891c330e 100644
--- a/drivers/floppy/floppy.c
+++ b/drivers/floppy/floppy.c
@@ -707,10 +707,10 @@ int opcode;			/* DEV_GATHER_S or DEV_SCATTER_S */
   pv_set(byte_out[0], DMA_INIT, DMA_RESET_VAL);	/* reset the dma controller */
   pv_set(byte_out[1], DMA_FLIPFLOP, 0);		/* write anything to reset it */
   pv_set(byte_out[2], DMA_MODE, opcode == DEV_SCATTER_S ? DMA_WRITE : DMA_READ);
-  pv_set(byte_out[3], DMA_ADDR, (unsigned) tmp_phys >>  0);
-  pv_set(byte_out[4], DMA_ADDR, (unsigned) tmp_phys >>  8);
-  pv_set(byte_out[5], DMA_TOP, (unsigned) (tmp_phys >> 16));
-  pv_set(byte_out[6], DMA_COUNT, (((SECTOR_SIZE - 1) >> 0) & 0xff));
+  pv_set(byte_out[3], DMA_ADDR, (unsigned) (tmp_phys >>  0) & 0xff);
+  pv_set(byte_out[4], DMA_ADDR, (unsigned) (tmp_phys >>  8) & 0xff);
+  pv_set(byte_out[5], DMA_TOP,  (unsigned) (tmp_phys >> 16) & 0xff);
+  pv_set(byte_out[6], DMA_COUNT, (((SECTOR_SIZE - 1) >> 0)) & 0xff);
   pv_set(byte_out[7], DMA_COUNT, (SECTOR_SIZE - 1) >> 8);
   pv_set(byte_out[8], DMA_INIT, 2);		/* some sort of enable */