Index: sys/geom/geom_sunlabel_enc.c =================================================================== RCS file: sys/geom/geom_sunlabel_enc.c diff -N sys/geom/geom_sunlabel_enc.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sys/geom/geom_sunlabel_enc.c 17 Apr 2003 13:55:30 -0000 @@ -0,0 +1,112 @@ +/*- + * Copyright (c) 2003 Poul-Henning Kamp + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + * Functions to encode or decode struct sun_disklabel into a bytestream + * of correct endianess and packing. These functions do no validation + * or sanity checking, they only pack/unpack the fields correctly. + * + * NB! This file must be usable both in kernel and userland. + * + */ + +#include +#include +#include + +#define SL_TEXT 0x0 +#define SL_TEXT_SIZEOF 0x80 +#define SL_RPM 0x1a4 +#define SL_PCYLINDERS 0x1a6 +#define SL_SPARESPERCYL 0x1a8 +#define SL_INTERLEAVE 0x1ae +#define SL_NCYLINDERS 0x1b0 +#define SL_ACYLINDERS 0x1b2 +#define SL_NTRACKS 0x1b4 +#define SL_NSECTORS 0x1b6 +#define SL_PART 0x1bc +#define SL_MAGIC 0x1fc +#define SL_CKSUM 0x1fe + +#define SL_NPART 0x8 + +#define SDKP_CYLOFFSET 0 +#define SDKP_NSECTORS 0x4 +#define SDKP_SIZEOF 0x8 + +void +sunlabel_dec(void const *pp, struct sun_disklabel *sl) +{ + const uint8_t *p; + size_t i; + + p = pp; + for (i = 0; i < sizeof(sl->sl_text); i++) + sl->sl_text[i] = p[SL_TEXT + i]; + sl->sl_rpm = be16dec(p + SL_RPM); + sl->sl_pcylinders = be16dec(p + SL_PCYLINDERS); + sl->sl_sparespercyl = be16dec(p + SL_SPARESPERCYL); + sl->sl_interleave = be16dec(p + SL_INTERLEAVE); + sl->sl_ncylinders = be16dec(p + SL_NCYLINDERS); + sl->sl_acylinders = be16dec(p + SL_ACYLINDERS); + sl->sl_ntracks = be16dec(p + SL_NTRACKS); + sl->sl_nsectors = be16dec(p + SL_NSECTORS); + for (i = 0; i < SL_NPART; i++) { + sl->sl_part[i].sdkp_cyloffset = be32dec(p + SL_PART + + (i * SDKP_SIZEOF) + SDKP_CYLOFFSET); + sl->sl_part[i].sdkp_nsectors = be32dec(p + SL_PART + + (i * SDKP_SIZEOF) + SDKP_NSECTORS); + } + sl->sl_magic = be16dec(p + SL_MAGIC); + sl->sl_cksum = be16dec(p + SL_CKSUM); +} + +void +sunlabel_enc(void *pp, struct sun_disklabel *sl) +{ + uint8_t *p; + size_t i; + + p = pp; + for (i = 0; i < SL_TEXT_SIZEOF; i++) + p[SL_TEXT + i] = sl->sl_text[i]; + be16enc(p + SL_RPM, sl->sl_rpm); + be16enc(p + SL_PCYLINDERS, sl->sl_pcylinders); + be16enc(p + SL_SPARESPERCYL, sl->sl_sparespercyl); + be16enc(p + SL_INTERLEAVE, sl->sl_interleave); + be16enc(p + SL_NCYLINDERS, sl->sl_ncylinders); + be16enc(p + SL_ACYLINDERS, sl->sl_acylinders); + be16enc(p + SL_NTRACKS, sl->sl_ntracks); + be16enc(p + SL_NSECTORS, sl->sl_nsectors); + for (i = 0; i < SL_NPART; i++) { + be32enc(p + SL_PART + (i * SDKP_SIZEOF) + SDKP_CYLOFFSET, + sl->sl_part[i].sdkp_cyloffset); + be32enc(p + SL_PART + (i * SDKP_SIZEOF) + SDKP_NSECTORS, + sl->sl_part[i].sdkp_nsectors); + } + be16enc(p + SL_MAGIC, sl->sl_magic); + be16enc(p + SL_CKSUM, sl->sl_cksum); +} Index: sys/sys/sun_disklabel.h =================================================================== RCS file: /home/ncvs/src/sys/sys/sun_disklabel.h,v retrieving revision 1.3 diff -u -r1.3 sun_disklabel.h --- sys/sys/sun_disklabel.h 29 Oct 2002 06:43:57 -0000 1.3 +++ sys/sys/sun_disklabel.h 17 Apr 2003 13:25:44 -0000 @@ -45,6 +45,9 @@ * $FreeBSD: src/sys/sys/sun_disklabel.h,v 1.3 2002/10/29 06:43:57 phk Exp $ */ +#ifndef _SYS_SUN_DISKLABEL_H_ +#define _SYS_SUN_DISKLABEL_H_ + /* * SunOS disk label layout (only relevant portions discovered here). */ @@ -102,4 +105,9 @@ #ifdef CTASSERT CTASSERT(sizeof (struct sun_disklabel) == 512); +#endif + +void sunlabel_dec(void const *pp, struct sun_disklabel *sl); +void sunlabel_enc(void *pp, struct sun_disklabel *sl); + #endif Index: sbin/sunlabel/Makefile =================================================================== RCS file: /home/ncvs/src/sbin/sunlabel/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- sbin/sunlabel/Makefile 15 Apr 2003 23:49:31 -0000 1.2 +++ sbin/sunlabel/Makefile 17 Apr 2003 13:22:45 -0000 @@ -1,8 +1,11 @@ # $FreeBSD: src/sbin/sunlabel/Makefile,v 1.2 2003/04/15 23:49:31 jake Exp $ PROG=sunlabel +SRCS=sunlabel.c geom_sunlabel_enc.c LINKS=${BINDIR}/sunlabel ${BINDIR}/disklabel NOMAN= WARNS=5 + +.PATH: ${.CURDIR}/../../sys/geom .include Index: sbin/sunlabel/sunlabel.c =================================================================== RCS file: /home/ncvs/src/sbin/sunlabel/sunlabel.c,v retrieving revision 1.2 diff -u -r1.2 sunlabel.c --- sbin/sunlabel/sunlabel.c 15 Apr 2003 23:46:19 -0000 1.2 +++ sbin/sunlabel/sunlabel.c 17 Apr 2003 13:51:57 -0000 @@ -261,13 +261,15 @@ uint32_t fwsectors; uint32_t fwheads; off_t mediasize; + char buf[512]; int fd; snprintf(path, sizeof(path), "%s%s", _PATH_DEV, disk); if ((fd = open(path, O_RDONLY)) < 0) err(1, "open %s", path); - if (read(fd, sl, sizeof(*sl)) != sizeof(*sl)) + if (read(fd, buf, sizeof(buf)) != sizeof(buf)) err(1, "read"); + sunlabel_dec(buf, sl); if (sl->sl_magic != SUN_DKMAGIC || checksum(sl) != sl->sl_cksum) { bzero(sl, sizeof(*sl)); if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0) @@ -319,6 +321,7 @@ { char path[MAXPATHLEN]; char boot[16 * 512]; + char buf[512]; off_t off; int bfd; int fd; @@ -356,7 +359,9 @@ } if (lseek(fd, 0, SEEK_SET) < 0) err(1, "lseek"); - if (write(fd, sl, sizeof(*sl)) != sizeof(*sl)) + bzero(buf, sizeof(buf)); + sunlabel_enc(buf, sl); + if (write(fd, buf, sizeof(buf)) != sizeof(buf)) err(1, "write"); close(fd); } else