Index: geom/geom_map.c =================================================================== --- geom/geom_map.c (revision 279320) +++ geom/geom_map.c (working copy) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010-2011 Aleksandr Rybalko - * based on geom_redboot.c * Copyright (c) 2009 Sam Leffler, Errno Consulting * All rights reserved. * @@ -34,11 +33,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include + #include #include -#include #include #include #include @@ -51,6 +48,9 @@ __FBSDID("$FreeBSD$"); #define MAP_CLASS_NAME "MAP" #define MAP_MAXSLICE 64 #define MAP_MAX_MARKER_LEN 64 +#define DPRINTF(...) if (bootverbose) { \ + printf("GEOM_MAP: " __VA_ARGS__); \ +} struct g_map_softc { off_t offset[MAP_MAXSLICE]; /* offset in flash */ @@ -119,8 +119,10 @@ g_map_dumpconf(struct sbuf *sb, const char *indent g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { if (indent == NULL) { - sbuf_printf(sb, " entry %jd", (intmax_t)sc->entry[pp->index]); - sbuf_printf(sb, " dsize %jd", (intmax_t)sc->dsize[pp->index]); + sbuf_printf(sb, " entry %jd", + (intmax_t)sc->entry[pp->index]); + sbuf_printf(sb, " dsize %jd", + (intmax_t)sc->dsize[pp->index]); } else { sbuf_printf(sb, "%s%jd\n", indent, (intmax_t)sc->entry[pp->index]); @@ -152,10 +154,9 @@ find_marker(struct g_consumer *cp, const char *lin if (ret < 3) return (1); - if (bootverbose) { - printf("MAP: search %s for key \"%s\" from 0x%jx, step 0x%jx\n", - cp->geom->name, search_key, (intmax_t)search_start, (intmax_t)search_step); - } + DPRINTF("search %s for key \"%s\" from 0x%jx, step 0x%jx\n", + cp->geom->name, search_key, (intmax_t)search_start, + (intmax_t)search_step); /* error if search_key is empty */ if (strlen(search_key) < 1) @@ -219,8 +220,7 @@ g_map_parse_part(struct g_class *mp, struct g_prov * as "/dev/map/uboot" */ if (resource_string_value("map", i, "name", &name) != 0) { - if (bootverbose) - printf("MAP: hint.map.%d has no name\n", i); + DPRINTF("hint.map.%d has no name\n", i); return (1); } @@ -231,29 +231,21 @@ g_map_parse_part(struct g_class *mp, struct g_prov * until we found marker or end of media reached */ if (resource_string_value("map", i, "start", &value) != 0) { - if (bootverbose) - printf("MAP: \"%s\" has no start value\n", name); + DPRINTF("\"%s\" has no start value\n", name); return (1); } if (find_marker(cp, value, &start) != 0) { - if (bootverbose) { - printf("MAP: \"%s\" can't parse/use start value\n", - name); - } + DPRINTF("\"%s\" can't parse/use start value\n", name); return (1); } /* like "start" */ if (resource_string_value("map", i, "end", &value) != 0) { - if (bootverbose) - printf("MAP: \"%s\" has no end value\n", name); + DPRINTF("\"%s\" has no end value\n", name); return (1); } if (find_marker(cp, value, &end) != 0) { - if (bootverbose) { - printf("MAP: \"%s\" can't parse/use start value\n", - name); - } + DPRINTF("\"%s\" can't parse/use start value\n", name); return (1); } @@ -265,10 +257,7 @@ g_map_parse_part(struct g_class *mp, struct g_prov if (resource_string_value("map", i, "offset", &value) == 0) { offset = strtouq(value, &op, 0); if (*op != '\0') { - if (bootverbose) { - printf("MAP: \"%s\" can't parse offset\n", - name); - } + DPRINTF("\"%s\" can't parse offset\n", name); return (1); } } else { @@ -279,10 +268,7 @@ g_map_parse_part(struct g_class *mp, struct g_prov if (resource_string_value("map", i, "dsize", &value) == 0) { dsize = strtouq(value, &op, 0); if (*op != '\0') { - if (bootverbose) { - printf("MAP: \"%s\" can't parse dsize\n", - name); - } + DPRINTF("\"%s\" can't parse dsize\n", name); return (1); } } else { @@ -295,18 +281,13 @@ g_map_parse_part(struct g_class *mp, struct g_prov /* end is 0 or size is 0, No MAP - so next */ if (end < start) { - if (bootverbose) { - printf("MAP: \"%s\", \"end\" less than " - "\"start\"\n", name); - } + DPRINTF("\"%s\", \"end\" less than \"start\"\n", name); return (1); } if (offset + dsize > size) { - if (bootverbose) { - printf("MAP: \"%s\", \"dsize\" bigger than " - "partition - offset\n", name); - } + DPRINTF("\"%s\", \"dsize\" bigger than partition - offset\n", + name); return (1); } @@ -313,19 +294,13 @@ g_map_parse_part(struct g_class *mp, struct g_prov ret = g_slice_config(gp, i, G_SLICE_CONFIG_SET, start + offset, dsize, cp->provider->sectorsize, "map/%s", name); if (ret != 0) { - if (bootverbose) { - printf("MAP: g_slice_config returns %d for \"%s\"\n", - ret, name); - } + DPRINTF("g_slice_config returns %d for \"%s\"\n", ret, name); return (1); } - if (bootverbose) { - printf("MAP: %s: %jxx%jx, data=%jxx%jx " - "\"/dev/map/%s\"\n", - cp->geom->name, (intmax_t)start, (intmax_t)size, (intmax_t)offset, - (intmax_t)dsize, name); - } + DPRINTF("%s: %jxx%jx, data=%jxx%jx \"/dev/map/%s\"\n", + cp->geom->name, (intmax_t)start, (intmax_t)size, + (intmax_t)offset, (intmax_t)dsize, name); sc->offset[i] = start; sc->size[i] = size; @@ -364,8 +339,7 @@ g_map_taste(struct g_class *mp, struct g_provider g_access(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { - if (bootverbose) - printf("MAP: No valid partition found at %s\n", pp->name); + DPRINTF("No valid partition found at %s\n", pp->name); g_slice_spoiled(cp); return (NULL); } @@ -372,23 +346,10 @@ g_map_taste(struct g_class *mp, struct g_provider return (gp); } -static void -g_map_config(struct gctl_req *req, struct g_class *mp, const char *verb) -{ - struct g_geom *gp; - - g_topology_assert(); - gp = gctl_get_geom(req, mp, "geom"); - if (gp == NULL) - return; - gctl_error(req, "Unknown verb"); -} - static struct g_class g_map_class = { .name = MAP_CLASS_NAME, .version = G_VERSION, .taste = g_map_taste, .dumpconf = g_map_dumpconf, - .ctlreq = g_map_config, }; DECLARE_GEOM_CLASS(g_map_class, g_map); Index: modules/geom/Makefile =================================================================== --- modules/geom/Makefile (revision 279320) +++ modules/geom/Makefile (working copy) @@ -11,6 +11,7 @@ SUBDIR= geom_bde \ geom_journal \ geom_label \ geom_linux_lvm \ + geom_map \ geom_mirror \ geom_mountver \ geom_multipath \ Index: modules/geom/geom_map/Makefile =================================================================== --- modules/geom/geom_map/Makefile (revision 0) +++ modules/geom/geom_map/Makefile (working copy) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../geom + +KMOD= geom_map +SRCS= geom_map.c bus_if.h device_if.h + +.include Property changes on: modules/geom/geom_map/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property