From 4297f0733eeec3d6b7dc0f93682e5c8b5d933182 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 15 Jan 1993 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1993-01-15 --- boot/dosboot.c | 2 +- gnot/segment.h | 1 - pc/devvga.c | 1 + pc/segment.h | 4 +++- port/devwren.c | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/boot/dosboot.c b/boot/dosboot.c index 85f50a788c21054095f92fc3c7e9e771d3fbd50f..25cc4b6214d10ccd7b7e09e515c721ad4674d1bb 100644 --- a/boot/dosboot.c +++ b/boot/dosboot.c @@ -32,7 +32,7 @@ dosboot(void) fatal("bind"); if(mount(fd, "/", MAFTER|MCREATE, "#f/fd0disk", "") < 0) if(mount(fd, "/", MAFTER|MCREATE, "#f/fd1disk", "") < 0) - if(mount(fd, "/", MAFTER|MCREATE, "#w/hd0dos", "") < 0) + if(mount(fd, "/", MAFTER|MCREATE, "#H/hd0dos", "") < 0) fatal("mount"); close(fd); diff --git a/gnot/segment.h b/gnot/segment.h index 6ae272a2e96cd0dc4544f36ae5bb88861210bf3a..e7efd47e66336fbeec3fe6118363d1788f4df6f6 100644 --- a/gnot/segment.h +++ b/gnot/segment.h @@ -14,7 +14,6 @@ struct Physseg }physseg[] = { { SG_SHARED, "lock", 0, SEGMAXSIZE, snewpage, putpage }, { SG_SHARED, "shared", 0, SEGMAXSIZE, snewpage, putpage }, - { SG_PHYSICAL, "kmem", KZERO, SEGMAXSIZE, 0, 0 }, { SG_BSS, "memory", 0, SEGMAXSIZE, snewpage, putpage }, { 0, 0, 0, 0, 0, 0 }, }; diff --git a/pc/devvga.c b/pc/devvga.c index 35e244a73febb7a81ccf624180440d2a34b474e0..e9763bfb8bfe770bb4a5ae3fba900e26ad1182fc 100644 --- a/pc/devvga.c +++ b/pc/devvga.c @@ -495,6 +495,7 @@ setscreen(int maxx, int maxy, int ldepth) p = xalloc(len); if(p == 0) error(Enobitstore); + memset(p, 0xff, len); mbb = NULLMBB; /* diff --git a/pc/segment.h b/pc/segment.h index 6ae272a2e96cd0dc4544f36ae5bb88861210bf3a..dcd217ea16a307838794039c4d5caa4dd63d5732 100644 --- a/pc/segment.h +++ b/pc/segment.h @@ -2,6 +2,8 @@ * Attach segment types */ +#define PCMEM (KZERO|0xd0000) + typedef struct Physseg Physseg; struct Physseg { @@ -14,7 +16,7 @@ struct Physseg }physseg[] = { { SG_SHARED, "lock", 0, SEGMAXSIZE, snewpage, putpage }, { SG_SHARED, "shared", 0, SEGMAXSIZE, snewpage, putpage }, - { SG_PHYSICAL, "kmem", KZERO, SEGMAXSIZE, 0, 0 }, + { SG_PHYSICAL, "pcmem", PCMEM, 64*1024, 0, 0, }, { SG_BSS, "memory", 0, SEGMAXSIZE, snewpage, putpage }, { 0, 0, 0, 0, 0, 0 }, }; diff --git a/port/devwren.c b/port/devwren.c index f5ccc3df8c8319c99088b1767830783d8c083f95..a752073854c53aa5d300f6e6faa1e545446b5bf3 100644 --- a/port/devwren.c +++ b/port/devwren.c @@ -90,9 +90,9 @@ wrengen(Chan *c, Dirtab *tab, long ntab, long s, Dir *dirp) pp = &dp->p[s]; if(drive & 7) - sprint(name, "hd%d.%d%s", drive>>3, drive&7, pp->name); + sprint(name, "sd%d.%d%s", drive>>3, drive&7, pp->name); else - sprint(name, "hd%d%s", drive>>3, pp->name); + sprint(name, "sd%d%s", drive>>3, pp->name); name[NAMELEN] = 0; qid.path = MKQID(drive, s); l = (pp->end - pp->start) * dp->bytes;