d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead code in bsdlabel depending on __alpha__

Browse Source
This commit is contained in:
Ulrich Spörlein 2011-03-10 08:24:21 +00:00
parent 15a6186cd1
commit 4c8dfc4aff
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/bsdlabel/bsdlabel.8
View File

@ -31,7 +31,7 @@
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
.\" $FreeBSD$
.\"
.Dd December 8, 2007
.Dd March 5, 2011
.Dt BSDLABEL 8
.Os
.Sh NAME
@ -109,9 +109,9 @@ argument forces
.Nm
to use a layout suitable for a different architecture.
Current valid values are
.Cm i386 , amd64 , ia64 , pc98 ,
.Cm i386 , amd64 , ia64 ,
and
.Cm alpha .
.Cm pc98 .
If this option is omitted,
.Nm
will use a layout suitable for the current machine.

36
sbin/bsdlabel/bsdlabel.c
View File

@ -129,12 +129,6 @@ static uint32_t lba_offset;
static int labelsoffset = LABELSECTOR;
static int labeloffset = LABELOFFSET;
static int bbsize = BBSIZE;
static int alphacksum =
#if defined(__alpha__)
1;
#else
0;
#endif
enum {
UNSPEC, EDIT, READ, RESTORE, WRITE, WRITEBOOT
@ -176,12 +170,6 @@ main(int argc, char *argv[])
labelsoffset = 1;
labeloffset = 0;
bbsize = 8192;
alphacksum = 0;
} else if (!strcmp(optarg, "alpha")) {
labelsoffset = 0;
labeloffset = 64;
bbsize = 8192;
alphacksum = 1;
} else {
errx(1, "Unsupported architecture");
}
@ -350,7 +338,6 @@ readboot(void)
{
int fd;
struct stat st;
uint64_t *p;
if (xxboot == NULL)
xxboot = "/boot/boot";
@ -358,21 +345,7 @@ readboot(void)
if (fd < 0)
err(1, "cannot open %s", xxboot);
fstat(fd, &st);
if (alphacksum && st.st_size <= BBSIZE - 512) {
if (read(fd, bootarea + 512, st.st_size) != st.st_size)
err(1, "read error %s", xxboot);
/*
* Set the location and length so SRM can find the
* boot blocks.
*/
p = (uint64_t *)bootarea;
p[60] = (st.st_size + secsize - 1) / secsize;
p[61] = 1;
p[62] = 0;
close(fd);
return;
} else if ((!alphacksum) && st.st_size <= BBSIZE) {
if (st.st_size <= BBSIZE) {
if (read(fd, bootarea, st.st_size) != st.st_size)
err(1, "read error %s", xxboot);
close(fd);
@ -407,7 +380,6 @@ geom_bsd_available(void)
static int
writelabel(void)
{
uint64_t *p, sum;
int i, fd, serrno;
struct gctl_req *grq;
char const *errstr;
@ -430,12 +402,6 @@ writelabel(void)
lab.d_partitions[i].p_offset += lba_offset;
bsd_disklabel_le_enc(bootarea + labeloffset + labelsoffset * secsize,
lp);
if (alphacksum) {
/* Generate the bootblock checksum for the SRM console. */
for (p = (uint64_t *)bootarea, i = 0, sum = 0; i < 63; i++)
sum += p[i];
p[63] = sum;
}
fd = open(specname, O_RDWR);
if (fd < 0) {