--- src/lib/libdisk/Attic/write_disk.c	2003/11/10 06:14:40	1.3
+++ src/lib/libdisk/Attic/write_disk.c	2005/03/13 15:10:03	1.4
@@ -31,11 +31,7 @@
 #define DEF_RPM			3600
 #define DEF_INTERLEAVE	1
 
-#ifdef PC98
-#define WHERE(offset,disk) (offset)
-#else
 #define WHERE(offset,disk) (disk->flags & DISK_ON_TRACK ? offset + 63 : offset)
-#endif
 
 /* XXX: A lot of hardcoded 512s probably should be foo->sector_size;
         I'm not sure which, so I leave it like it worked before. --schweikh */
@@ -47,9 +43,6 @@ Write_FreeBSD(int fd, struct disk *new,
 	int i,j;
 	void *p;
 	u_char buf[BBSIZE];
-#ifdef __alpha__
-	u_long *lp, sum;
-#endif
 
 	for(i = 0; i < BBSIZE/512; i++) {
 		p = read_block(fd, WHERE(i + c1->offset, new), 512);
@@ -62,9 +55,6 @@ Write_FreeBSD(int fd, struct disk *new,
 
 	if(new->boot2)
 		memcpy(buf + 512, new->boot2, BBSIZE-512);
-#elif defined(__alpha__)
-	if(new->boot1)
-		memcpy(buf + 512, new->boot1, BBSIZE-512);
 #endif
 
 	dl = (struct disklabel *)(buf + 512 * LABELSECTOR + LABELOFFSET);
@@ -73,11 +63,7 @@ Write_FreeBSD(int fd, struct disk *new,
 	for(c2 = c1->part; c2; c2 = c2->next) {
 		if (c2->type == unused) continue;
 		if (!strcmp(c2->name, "X")) continue;
-#ifdef __alpha__
-		j = c2->name[strlen(c2->name) - 1] - 'a';
-#else
 		j = c2->name[strlen(new->name) + 2] - 'a';
-#endif
 		if (j < 0 || j >= MAXPARTITIONS || j == RAW_PART) {
 #ifdef DEBUG
 			warn("weird partition letter %c", c2->name[strlen(new->name) + 2]);
@@ -112,38 +98,15 @@ Write_FreeBSD(int fd, struct disk *new,
 	    new->name[0] == 'o' ? DTYPE_SCSI : DTYPE_ESDI;
 	dl->d_partitions[RAW_PART].p_size = c1->size;
 	dl->d_partitions[RAW_PART].p_offset = c1->offset;
-#ifdef PC98
-	dl->d_rpm = 3600;
-	dl->d_interleave = 1;
-#endif
 
-#ifndef PC98
 	if(new->flags & DISK_ON_TRACK)
 		for(i=0;i<MAXPARTITIONS;i++)
 			if (dl->d_partitions[i].p_size)
 				dl->d_partitions[i].p_offset += 63;
-#endif
 	dl->d_magic = DISKMAGIC;
 	dl->d_magic2 = DISKMAGIC;
 	dl->d_checksum = dkcksum(dl);
 
-#ifdef __alpha__
-	/*
-	 * Tell SRM where the bootstrap is.
-	 */
-	lp = (u_long *)buf;
-	lp[60] = 15;
-	lp[61] = 1;
-	lp[62] = 0;
-
-	/*
-	 * Generate the bootblock checksum for the SRM console.
-	 */
-	for (lp = (u_long *)buf, i = 0, sum = 0; i < 63; i++)
-	    sum += lp[i];
-	lp[63] = sum;
-#endif /*__alpha__*/
-
 	for(i=0;i<BBSIZE/512;i++) {
 		write_block(fd,WHERE(i + c1->offset, new), buf + 512 * i, 512);
 	}
@@ -157,7 +120,7 @@ Write_Extended(int fd, struct disk *new,
 	return 0;
 }
 
-#if defined(__i386__) && !defined(PC98)
+#if defined(__i386__)
 static void
 Write_Int32(u_int32_t *p, u_int32_t v)
 {
@@ -169,7 +132,7 @@ Write_Int32(u_int32_t *p, u_int32_t v)
 }
 #endif
 
-#if defined(__i386__) && !defined(PC98)
+#if defined(__i386__)
 /*
  * Special install-time configuration for the i386 boot0 boot manager.
  */
@@ -198,29 +161,16 @@ Write_Disk(struct disk *d1)
 	char device[64];
 	u_char *mbr;
 	struct dos_partition *dp,work[NDOSPART];
-#ifdef PC98
-	int s[7];
-	int PC98_EntireDisk = 0;
-#else
 	int s[4];
 #ifdef __i386__
 	int need_edd = 0;	/* Need EDD (packet interface) */
 #endif
-#endif
 	int one = 1;
 	int zero = 0;
 
 	strcpy(device,_PATH_DEV);
         strcat(device,d1->name);
 
-#ifdef PC98
-	/* XXX - for entire FreeBSD(98) */
-	for (c1 = d1->chunks->part; c1; c1 = c1->next) {
-	    if ((c1->type == freebsd) || (c1->offset == 0))
-		device[9] = 0;
-	}
-#endif
-
         fd = open(device,O_RDWR);
         if (fd < 0) {
 #ifdef DEBUG
@@ -231,11 +181,7 @@ Write_Disk(struct disk *d1)
 	ioctl(fd, DIOCWLABEL, &one);
 
 	memset(s,0,sizeof s);
-#ifdef PC98
-	mbr = read_block(fd, WHERE(1, d1), d1->sector_size);
-#else
 	mbr = read_block(fd, WHERE(0, d1), d1->sector_size);
-#endif
 	dp = (struct dos_partition*)(mbr + DOSPARTOFF);
 	memcpy(work, dp, sizeof work);
 	dp = work;
@@ -246,37 +192,20 @@ Write_Disk(struct disk *d1)
 #ifdef __i386__
 		j = c1->name[4] - '1';
 		j = c1->name[strlen(d1->name) + 1] - '1';
-#ifdef PC98
-		if (j < 0 || j > 7)
-#else
 		if (j < 0 || j > 3)
-#endif
 			continue;
 		s[j]++;
 #endif
-#ifndef PC98
 		if (c1->type == extended)
 			ret += Write_Extended(fd, d1, old, c1);
-#endif
 		if (c1->type == freebsd)
 			ret += Write_FreeBSD(fd, d1, old, c1);
 
 #ifdef __i386__
-#ifndef PC98
 		Write_Int32(&dp[j].dp_start, c1->offset);
 		Write_Int32(&dp[j].dp_size, c1->size);
-#endif
 
 		i = c1->offset;
-#ifdef PC98
-		dp[j].dp_ssect = dp[j].dp_ipl_sct = i % d1->bios_sect;
-		i -= dp[j].dp_ssect;
-		i /= d1->bios_sect;
-		dp[j].dp_shd = dp[j].dp_ipl_head = i % d1->bios_hd;
-		i -= dp[j].dp_shd;
-		i /= d1->bios_hd;
-		dp[j].dp_scyl = dp[j].dp_ipl_cyl = i;
-#else
 		if (i >= 1024*d1->bios_sect*d1->bios_hd) {
 			dp[j].dp_ssect = 0xff;
 			dp[j].dp_shd = 0xff;
@@ -293,7 +222,6 @@ Write_Disk(struct disk *d1)
 			i -= dp[j].dp_scyl;
 			dp[j].dp_ssect |= i >> 2;
 		}
-#endif /* PC98 */
 
 #ifdef DEBUG
 		printf("S:%lu = (%x/%x/%x)",
@@ -301,20 +229,6 @@ Write_Disk(struct disk *d1)
 #endif
 
 		i = c1->end;
-#ifdef PC98
-#if 1
-		dp[j].dp_esect = dp[j].dp_ehd = 0;
-		dp[j].dp_ecyl = i / (d1->bios_sect * d1->bios_hd);
-#else
-		dp[j].dp_esect = i % d1->bios_sect;
-		i -= dp[j].dp_esect;
-		i /= d1->bios_sect;
-		dp[j].dp_ehd =  i % d1->bios_hd;
-		i -= dp[j].dp_ehd;
-		i /= d1->bios_hd;
-		dp[j].dp_ecyl = i;
-#endif
-#else
 		dp[j].dp_esect = i % d1->bios_sect;
 		i -= dp[j].dp_esect++;
 		i /= d1->bios_sect;
@@ -325,64 +239,32 @@ Write_Disk(struct disk *d1)
 		dp[j].dp_ecyl = i;
 		i -= dp[j].dp_ecyl;
 		dp[j].dp_esect |= i >> 2;
-#endif
 
 #ifdef DEBUG
 		printf("  E:%lu = (%x/%x/%x)\n",
 			c1->end, dp[j].dp_ecyl, dp[j].dp_ehd, dp[j].dp_esect);
 #endif
 
-#ifdef PC98
-		dp[j].dp_mid = c1->subtype & 0xff;
-		dp[j].dp_sid = c1->subtype >> 8;
-		if (c1->flags & CHUNK_ACTIVE)
-			dp[j].dp_mid |= 0x80;
-
-		strncpy(dp[j].dp_name, c1->sname, 16);
-#else
 		dp[j].dp_typ = c1->subtype;
 		if (c1->flags & CHUNK_ACTIVE)
 			dp[j].dp_flag = 0x80;
 		else
 			dp[j].dp_flag = 0;
 #endif
-#endif
 	}
 #ifdef __i386__
 	j = 0;
 	for(i = 0; i < NDOSPART; i++) {
 		if (!s[i])
 			memset(dp + i, 0, sizeof *dp);
-#ifndef PC98
 		if (dp[i].dp_flag)
 			j++;
-#endif
 	}
-#ifndef PC98
 	if (!j)
 		for(i = 0; i < NDOSPART; i++)
 			if (dp[i].dp_typ == 0xa5)
 				dp[i].dp_flag = 0x80;
-#endif
-
-#ifdef PC98
-	if (d1->bootipl)
-		write_block(fd, WHERE(0, d1), d1->bootipl, d1->sector_size);
 
-	mbr = read_block(fd, WHERE(1, d1), d1->sector_size);
-	memcpy(mbr + DOSPARTOFF, dp, sizeof *dp * NDOSPART);
-	/* XXX - for entire FreeBSD(98) */
-	for (c1 = d1->chunks->part; c1; c1 = c1->next)
-		if (((c1->type == freebsd) || (c1->type == fat))
-			 && (c1->offset == 0))
-			PC98_EntireDisk = 1;
-	if (PC98_EntireDisk == 0)
-		write_block(fd, WHERE(1, d1), mbr, d1->sector_size);
-
-	if (d1->bootmenu)
-		for (i = 0; i * d1->sector_size < d1->bootmenu_size; i++)
-			write_block(fd, WHERE(2 + i, d1), &d1->bootmenu[i * d1->sector_size], d1->sector_size);
-#else
 	mbr = read_block(fd, WHERE(0, d1), d1->sector_size);
 	if (d1->bootmgr) {
 		memcpy(mbr, d1->bootmgr, DOSPARTOFF);
@@ -396,7 +278,6 @@ Write_Disk(struct disk *d1)
 	  for(i = 1; i * d1->sector_size <= d1->bootmgr_size; i++)
 	    write_block(fd, WHERE(i, d1), &d1->bootmgr[i * d1->sector_size], d1->sector_size);
 #endif
-#endif
 
 	i = 1;
 	i = ioctl(fd, DIOCSYNCSLICEINFO, &i);