From 09734734a10deb488f74a5ef2766a4cbf4d7e12d Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 19 Dec 1995 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1995-12-19 --- pc/devata.c | 7 ++++++- pc/main.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pc/devata.c b/pc/devata.c index 7ded22646623e7c1c89d805b764dc234cde6d61e..7021974439fcb8a9711c5baa5d32eb8a4683f0b2 100644 --- a/pc/devata.c +++ b/pc/devata.c @@ -1392,15 +1392,18 @@ atapart(Drive *dp) * we still check if there is a valid partition table in * the last sector if none is found in the second last. */ - ataxfer(dp, &dp->p[0], Cread, dp->p[0].end-1, dp->bytes, buf); +print("R%d|", dp->p[0].end-2); + ataxfer(dp, &dp->p[0], Cread, dp->p[0].end-2, dp->bytes, buf); buf[dp->bytes-1] = 0; n = getfields((char*)buf, line, Npart+1, "\n"); if(n > 0 && strncmp(line[0], PARTMAGIC, sizeof(PARTMAGIC)-1) == 0){ dp->p[0].end--; dp->p[1].start--; dp->p[1].end--; +print("OK%d|", dp->p[1].start); } else{ +print("r%d|", dp->p[1].start); ataxfer(dp, &dp->p[1], Cread, 0, dp->bytes, buf); buf[dp->bytes-1] = 0; n = getfields((char*)buf, line, Npart+1, "\n"); @@ -1408,7 +1411,9 @@ atapart(Drive *dp) dp->p[0].end--; dp->p[1].start--; dp->p[1].end--; +print("nok%d|", dp->p[1].start); } +else print("ok%d|", dp->p[1].start); } } else{ diff --git a/pc/main.c b/pc/main.c index 5559616e4a753d91caac435e9fa22e7ded59f21d..30c2d9571e6fcd46ad9846ece7afb446cb814c3e 100644 --- a/pc/main.c +++ b/pc/main.c @@ -338,18 +338,18 @@ romscan(void) p += p[2]*512; continue; } - p[0] = 0xff; - p[2048-1] = 0xff; - if(p[0] == 0xff && p[2048-1] == 0xff) + p[0] = 0xCC; + p[2048-1] = 0xCC; + if(p[0] != 0xCC && p[2048-1] != 0xCC) putisa(PADDR(p), 2048); p += 2048; } p = (uchar*)(KZERO+0xE0000); if(p[0] != 0x55 || p[1] != 0xAA){ - p[0] = 0xff; + p[0] = 0xCC; p[64*1024-1] = 0xff; - if(p[0] == 0xff && p[64*1024-1] == 0xff) + if(p[0] != 0xCC && p[64*1024-1] != 0xCC) putisa(PADDR(p), 64*1024); } }