Deleted Added
full compact
mbr.c (271881) mbr.c (272485)
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/usr.bin/mkimg/mbr.c 271881 2014-09-19 23:16:02Z marcel $");
28__FBSDID("$FreeBSD: head/usr.bin/mkimg/mbr.c 272485 2014-10-03 20:48:11Z marcel $");
29
30#include <sys/types.h>
31#include <sys/diskmbr.h>
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>

--- 17 unchanged lines hidden (view full) ---

54mbr_metadata(u_int where, lba_t blk)
55{
56
57 blk += (where == SCHEME_META_IMG_START) ? 1 : 0;
58 return (round_track(blk));
59}
60
61static void
29
30#include <sys/types.h>
31#include <sys/diskmbr.h>
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>

--- 17 unchanged lines hidden (view full) ---

54mbr_metadata(u_int where, lba_t blk)
55{
56
57 blk += (where == SCHEME_META_IMG_START) ? 1 : 0;
58 return (round_track(blk));
59}
60
61static void
62mbr_chs(u_char *cyl, u_char *hd, u_char *sec, uint32_t lba __unused)
62mbr_chs(u_char *cylp, u_char *hdp, u_char *secp, lba_t lba)
63{
63{
64 u_int cyl, hd, sec;
64
65
65 *cyl = 0xff; /* XXX */
66 *hd = 0xff; /* XXX */
67 *sec = 0xff; /* XXX */
66 mkimg_chs(lba, 1023, &cyl, &hd, &sec);
67 *cylp = cyl;
68 *hdp = hd;
69 *secp = (sec & 0x3f) | ((cyl >> 2) & 0xc0);
68}
69
70static int
71mbr_write(lba_t imgsz __unused, void *bootcode)
72{
73 u_char *mbr;
74 struct dos_partition *dpbase, *dp;
75 struct part *part;
70}
71
72static int
73mbr_write(lba_t imgsz __unused, void *bootcode)
74{
75 u_char *mbr;
76 struct dos_partition *dpbase, *dp;
77 struct part *part;
78 lba_t size;
76 int error;
77
78 mbr = malloc(secsz);
79 if (mbr == NULL)
80 return (ENOMEM);
81 if (bootcode != NULL) {
82 memcpy(mbr, bootcode, DOSPARTOFF);
83 memset(mbr + DOSPARTOFF, 0, secsz - DOSPARTOFF);
84 } else
85 memset(mbr, 0, secsz);
86 le16enc(mbr + DOSMAGICOFFSET, DOSMAGIC);
87 dpbase = (void *)(mbr + DOSPARTOFF);
88 STAILQ_FOREACH(part, &partlist, link) {
79 int error;
80
81 mbr = malloc(secsz);
82 if (mbr == NULL)
83 return (ENOMEM);
84 if (bootcode != NULL) {
85 memcpy(mbr, bootcode, DOSPARTOFF);
86 memset(mbr + DOSPARTOFF, 0, secsz - DOSPARTOFF);
87 } else
88 memset(mbr, 0, secsz);
89 le16enc(mbr + DOSMAGICOFFSET, DOSMAGIC);
90 dpbase = (void *)(mbr + DOSPARTOFF);
91 STAILQ_FOREACH(part, &partlist, link) {
92 size = round_track(part->size);
89 dp = dpbase + part->index;
90 dp->dp_flag = (part->index == 0 && bootcode != NULL) ? 0x80 : 0;
91 mbr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
92 part->block);
93 dp->dp_typ = ALIAS_TYPE2INT(part->type);
94 mbr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
93 dp = dpbase + part->index;
94 dp->dp_flag = (part->index == 0 && bootcode != NULL) ? 0x80 : 0;
95 mbr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
96 part->block);
97 dp->dp_typ = ALIAS_TYPE2INT(part->type);
98 mbr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
95 part->block + part->size - 1);
99 part->block + size - 1);
96 le32enc(&dp->dp_start, part->block);
100 le32enc(&dp->dp_start, part->block);
97 le32enc(&dp->dp_size, part->size);
101 le32enc(&dp->dp_size, size);
98 }
99 error = image_write(0, mbr, 1);
100 free(mbr);
101 return (error);
102}
103
104static struct mkimg_scheme mbr_scheme = {
105 .name = "mbr",
106 .description = "Master Boot Record",
107 .aliases = mbr_aliases,
108 .metadata = mbr_metadata,
109 .write = mbr_write,
110 .bootcode = 512,
111 .nparts = NDOSPART,
112 .maxsecsz = 4096
113};
114
115SCHEME_DEFINE(mbr_scheme);
102 }
103 error = image_write(0, mbr, 1);
104 free(mbr);
105 return (error);
106}
107
108static struct mkimg_scheme mbr_scheme = {
109 .name = "mbr",
110 .description = "Master Boot Record",
111 .aliases = mbr_aliases,
112 .metadata = mbr_metadata,
113 .write = mbr_write,
114 .bootcode = 512,
115 .nparts = NDOSPART,
116 .maxsecsz = 4096
117};
118
119SCHEME_DEFINE(mbr_scheme);