Attachment 146742 Details for Bug 144234 – stable_10.patch

[patch] stable_10.patch

file_144234.txt (text/plain), 1.40 KB, created by John Baldwin on 2014-09-03 17:52:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Baldwin

Created: 2014-09-03 17:52:43 UTC

Size: 1.40 KB

patch

obsolete

>Index: drv.c
>===================================================================
>--- drv.c	(revision 270928)
>+++ drv.c	(working copy)
>@@ -54,11 +54,37 @@ drvsize(struct dsk *dskp)
> 
> #ifndef USE_XREAD
> static struct edd_packet packet;
>+static char bounce_buffer[512];
>+
>+static int drvread_one(struct dsk *, void *, daddr_t, unsigned);
> #endif
> 
> int
> drvread(struct dsk *dskp, void *buf, daddr_t lba, unsigned nblk)
> {
>+#ifndef USE_XREAD
>+	int i;
>+
>+	/* If the buffer is below 1MB, pass it through directly. */
>+	if (VTOP((char *)buf + nblk * 512) >> 20 == 0)
>+		return (drvread_one(dskp, buf, lba, nblk));
>+
>+	/*
>+	 * Use the bounce buffer to transfer the data one sector at a
>+	 * time.
>+	 */
>+	for (i = 0; i < nblk; i++) {
>+		if (drvread_one(dskp, bounce_buffer, lba + i, 1) < 0)
>+			return (-1);
>+		memcpy((char *)buf + 512 * i, bounce_buffer, 512);
>+	}
>+	return (0);
>+}
>+
>+static int
>+drvread_one(struct dsk *dskp, void *buf, daddr_t lba, unsigned nblk)
>+{
>+#endif
> 	static unsigned c = 0x2d5c7c2f;
> 
> 	if (!OPT_CHECK(RBX_QUIET))
>@@ -88,6 +114,9 @@ drvread(struct dsk *dskp, void *buf, daddr_t lba,
> 	if (V86_CY(v86.efl)) {
> 		printf("%s: error %u lba %u\n",
> 		    BOOTPROG, v86.eax >> 8 & 0xff, lba);
>+		if ((v86.eax >> 8 & 0xff) == 0x1)
>+			printf("    drv %x count %u to %x:%x\n", dskp->drive,
>+			    nblk, VTOPSEG(buf), VTOPOFF(buf));
> 		return (-1);
> 	}
> 	return (0);

Actions: View | Diff

Attachments on bug 144234: 146387 | 146392 | 146742 | 159025 | 172443 | 197090