Attached, find several libpayload updates:
libpayload-console.diff:
don't initialize "in" as it is initialized again one line below.
libpayload-curses.diff:
Mostly cosmetical changes.
- #if 0 some incomplete, non-working code instead of failing half way
through
the function
- Don't read a NULL pointer in wclrtoeol
libpayload-drivers.diff:
Some driver fixes for libpayload:
- fix minor bug in serial driver.
- latest USB stack fixes
- fix dead store in options.c
libpayload-getopt.diff:
getopt for libpayload. in case someone wants to pass parameters to
payloads and
parse them.
libpayload-malloc.diff:
working memalign version for libpayload. This fixes problems with the
USB stack
in FILO.
Best regards,
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: [email protected] • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866
don't initialize "in" as it is initialized again one line below.
Signed-off-by: Stefan Reinauer <[email protected]>
--- libc/console.c (.../branches/upstream/libpayload)
+++ libc/console.c (.../trunk/libpayload)
@@ -110,7 +110,7 @@
#ifdef CONFIG_USB
usb_poll();
#endif
- struct console_input_driver *in = console_in;
+ struct console_input_driver *in;
for (in = console_in; in != 0; in = in->next)
if (in->havechar())
return in->getchar();
Mostly cosmetical changes.
- #if 0 some incomplete, non-working code instead of failing half way through
the function
- Don't read a NULL pointer in wclrtoeol
Signed-off-by: Stefan Reinauer <[email protected]>
--- curses/tinycurses.c (.../branches/upstream/libpayload)
+++ curses/tinycurses.c (.../trunk/libpayload)
@@ -3,7 +3,7 @@
*
* Copyright (C) 2007 Uwe Hermann <[email protected]>
* Copyright (C) 2008 Ulf Jordan <[email protected]>
- * Copyright (C) 2008 coresystems GmbH
+ * Copyright (C) 2008-2009 coresystems GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -232,6 +232,7 @@
}
WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int
begx)
{
+#if 0
WINDOW *win = NULL;
int i;
int flags = _SUBWIN;
@@ -255,9 +256,9 @@
flags |= _ISPAD;
// FIXME
- //// if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
- //// orig->_begx + begx, flags)) == 0)
- //// return NULL;
+ if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
+ orig->_begx + begx, flags)) == 0)
+ return NULL;
win->_pary = begy;
win->_parx = begx;
@@ -270,6 +271,9 @@
win->_parent = orig;
return win;
+#else
+ return NULL;
+#endif
}
int doupdate(void) { /* TODO */ return(0); }
// WINDOW * dupwin (WINDOW *) {}
@@ -614,7 +618,7 @@
return OK;
}
// int wclrtobot (WINDOW *) {}
-int wclrtoeol(WINDOW *win) { /* TODO */ return(*(int *)0); }
+int wclrtoeol(WINDOW *win) { /* TODO */ return ERR; }
int wcolor_set(WINDOW *win, short color_pair_number, void *opts)
{
if (!opts && (color_pair_number >= 0)
Some driver fixes for libpayload:
- fix minor bug in serial driver.
- latest USB stack fixes
- fix dead store in options.c
Signed-off-by: Stefan Reinauer <[email protected]>
--- drivers/serial.c (.../branches/upstream/libpayload)
+++ drivers/serial.c (.../trunk/libpayload)
@@ -55,7 +55,7 @@
outb(DIVISOR(speed) >> 8 & 0xFF, port + 1);
/* Restore the previous value of the divisor. */
- outb(reg &= ~0x80, port + 0x03);
+ outb(reg & ~0x80, port + 0x03);
}
static struct console_input_driver consin = {
--- drivers/usb/usbhid.c (.../branches/upstream/libpayload)
+++ drivers/usb/usbhid.c (.../trunk/libpayload)
@@ -178,7 +178,7 @@
dev->destroy = usb_hid_destroy;
dev->poll = usb_hid_poll;
int i;
- for (i = 1; i <= dev->num_endp; i++) {
+ for (i = 0; i <= dev->num_endp; i++) {
if (dev->endpoints[i].endpoint == 0)
continue;
if (dev->endpoints[i].type != INTERRUPT)
@@ -187,6 +187,7 @@
continue;
break;
}
+ printf (" found endpoint %x for interrupt-in\n", i);
/* 20 buffers of 8 bytes, for every 10 msecs */
HID_INST(dev)->queue =
dev->controller->create_intr_queue (&dev->endpoints[i], 8, 20, 10);
count = 0;
--- drivers/usb/uhci.c (.../branches/upstream/libpayload)
+++ drivers/usb/uhci.c (.../trunk/libpayload)
@@ -63,7 +63,23 @@
static void
td_dump (td_t *td)
{
- printf ("%x packet (at %lx) to %x.%x failed\n", td->pid,
+ char td_value[3];
+ char *td_type;
+ switch (td->pid) {
+ case SETUP:
+ td_type="SETUP";
+ break;
+ case IN:
+ td_type="IN";
+ break;
+ case OUT:
+ td_type="OUT";
+ break;
+ default:
+ sprintf(td_value, "%x", td->pid);
+ td_type=td_value;
+ }
+ printf ("%s packet (at %lx) to %x.%x failed\n", td_type,
virt_to_phys (td), td->dev_addr, td->endp);
printf ("td (counter at %x) returns: ", td->counter);
printf (" bitstuff err: %x, ", td->status_bitstuff_err);
@@ -493,6 +509,7 @@
qh_t *qh = memalign(16, sizeof(qh_t));
qh->elementlinkptr.ptr = virt_to_phys(tds);
+ qh->elementlinkptr.queue_head = 0;
qh->elementlinkptr.terminate = 0;
intr_q *q = malloc(sizeof(intr_q));
--- drivers/usb/usb.c (.../branches/upstream/libpayload)
+++ drivers/usb/usb.c (.../trunk/libpayload)
@@ -281,7 +281,16 @@
int num = cd->bNumInterfaces;
interface_descriptor_t *current = interface;
printf ("device has %x interfaces\n", num);
- num = (num > 5) ? 5 : num;
+ if (num>1)
+ printf ("NOTICE: This driver defaults to using the
first interface.\n"
+ "This might be the wrong choice and lead to
limited functionality\n"
+ "of the device. Please report such a case to
[email protected]\n"
+ "as you might be the first.\n");
+ /* we limit to the first interface, as there was no need to
+ implement something else for the time being. If you need
+ it, see the SetInterface and GetInterface functions in
+ the USB specification, and adapt appropriately. */
+ num = (num > 1) ? 1 : num;
for (i = 0; i < num; i++) {
int j;
printf (" #%x has %x endpoints, interface %x:%x,
protocol %x\n", current->bInterfaceNumber, current->bNumEndpoints,
current->bInterfaceClass, current->bInterfaceSubClass,
current->bInterfaceProtocol);
--- drivers/usb/usbmsc.c (.../branches/upstream/libpayload)
+++ drivers/usb/usbmsc.c (.../trunk/libpayload)
@@ -299,6 +299,8 @@
memset (&cb, 0, sizeof (cb));
cb.command = 0x25; // read capacity
u8 buf[8];
+
+ printf ("Reading capacity of mass storage device.\n");
int count = 0;
while ((count++ < 20)
&&
@@ -306,8 +308,8 @@
(dev, cbw_direction_data_in, (u8 *) &cb, sizeof (cb), buf,
8) == 1));
if (count >= 20) {
- // still not successful, assume 2tb in 512byte sectors, which
is just the same garbage as any other number, but probably reasonable.
- printf ("assuming 2TB in 512byte sectors as READ CAPACITY
didn't answer.\n");
+ // still not successful, assume 2tb in 512byte sectors, which
is just the same garbage as any other number, but probably more usable.
+ printf ("Assuming 2TB in 512byte sectors as READ CAPACITY
didn't answer.\n");
MSC_INST (dev)->numblocks = 0xffffffff;
MSC_INST (dev)->blocksize = 512;
} else {
--- drivers/options.c (.../branches/upstream/libpayload)
+++ drivers/options.c (.../trunk/libpayload)
@@ -55,8 +55,6 @@
u32 addr, bit;
u8 reg8;
- value = valptr;
-
/* Convert to byte borders */
addr=(bitnum / 8);
bit=(bitnum % 8);
@@ -85,7 +83,6 @@
int len = strnlen(name, CMOS_MAX_NAME_LENGTH);
/* cmos entries are located right after the option table */
- cmos_entry=(struct cb_cmos_entries*)((unsigned char *)option_table +
option_table->header_length);
for ( cmos_entry = (struct cb_cmos_entries*)((unsigned char
*)option_table + option_table->header_length);
cmos_entry->tag == CB_TAG_OPTION;
getopt for libpayload. in case someone wants to pass parameters to payloads and
parse them.
Signed-off-by: Stefan Reinauer <[email protected]>
--- include/getopt.h (.../branches/upstream/libpayload)
+++ include/getopt.h (.../trunk/libpayload)
@@ -0,0 +1,78 @@
+/* $OpenBSD: getopt.h,v 1.2 2008/06/26 05:42:04 ray Exp $ */
+/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+// #include <sys/cdefs.h>
+
+/*
+ * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
+ */
+#define no_argument 0
+#define required_argument 1
+#define optional_argument 2
+
+struct option {
+ /* name of long option */
+ const char *name;
+ /*
+ * one of no_argument, required_argument, and optional_argument:
+ * whether option takes an argument
+ */
+ int has_arg;
+ /* if not NULL, set *flag to val when option found */
+ int *flag;
+ /* if flag not NULL, value to set *flag to; else return value */
+ int val;
+};
+
+//__BEGIN_DECLS
+int getopt_long(int, char * const *, const char *,
+ const struct option *, int *);
+int getopt_long_only(int, char * const *, const char *,
+ const struct option *, int *);
+#ifndef _GETOPT_DEFINED_
+#define _GETOPT_DEFINED_
+int getopt(int, char * const *, const char *);
+int getsubopt(char **, char * const *, char **);
+
+extern char *optarg; /* getopt(3) external variables */
+extern int opterr;
+extern int optind;
+extern int optopt;
+extern int optreset;
+extern char *suboptarg; /* getsubopt(3) external variable */
+#endif
+//__END_DECLS
+
+#endif /* !_GETOPT_H_ */
--- libc/getopt_long.c (.../branches/upstream/libpayload)
+++ libc/getopt_long.c (.../trunk/libpayload)
@@ -0,0 +1,522 @@
+/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */
+/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <[email protected]>
+ * Copyright (c) 2008 coresystems GmbH
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+#include <err.h>
+#include <errno.h>
+*/
+#include <libpayload.h>
+#include <getopt.h>
+#define warnx(x...) printf(x)
+/*
+#include <stdlib.h>
+#include <string.h>
+*/
+#define REPLACE_GETOPT /* use this getopt as the system
getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int opterr = 1; /* if error message should be printed */
+int optind = 1; /* index into parent argv vector */
+int optopt = '?'; /* character checked for validity */
+int optreset; /* reset getopt */
+char *optarg; /* argument associated with option */
+
+int posixly_correct = 0;
+#endif
+
+#define PRINT_ERROR ((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */
+#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */
+
+/* return values */
+#define BADCH (int)'?'
+#define BADARG ((*options == ':') ? (int)':' : (int)'?')
+#define INORDER (int)1
+
+#define EMSG ""
+
+static int getopt_internal(int, char * const *, const char *,
+ const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+ const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+
+static char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1; /* first option after non options (for permute)
*/
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+ int c;
+
+ c = a % b;
+ while (c != 0) {
+ a = b;
+ b = c;
+ c = a % b;
+ }
+
+ return (b);
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+ char * const *nargv)
+{
+ int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+ char *swap;
+
+ /*
+ * compute lengths of blocks and number and size of cycles
+ */
+ nnonopts = panonopt_end - panonopt_start;
+ nopts = opt_end - panonopt_end;
+ ncycle = gcd(nnonopts, nopts);
+ cyclelen = (opt_end - panonopt_start) / ncycle;
+
+ for (i = 0; i < ncycle; i++) {
+ cstart = panonopt_end+i;
+ pos = cstart;
+ for (j = 0; j < cyclelen; j++) {
+ if (pos >= panonopt_end)
+ pos -= nnonopts;
+ else
+ pos += nopts;
+ swap = nargv[pos];
+ /* LINTED const cast */
+ ((char **) nargv)[pos] = nargv[cstart];
+ /* LINTED const cast */
+ ((char **)nargv)[cstart] = swap;
+ }
+ }
+}
+
+/*
+ * parse_long_options --
+ * Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+ const struct option *long_options, int *idx, int short_too)
+{
+ char *current_argv, *has_equal;
+ size_t current_argv_len;
+ int i, match;
+
+ current_argv = place;
+ match = -1;
+
+ optind++;
+
+ if ((has_equal = strchr(current_argv, '=')) != NULL) {
+ /* argument found (--option=arg) */
+ current_argv_len = has_equal - current_argv;
+ has_equal++;
+ } else
+ current_argv_len = strlen(current_argv);
+
+ for (i = 0; long_options[i].name; i++) {
+ /* find matching long option */
+ if (strncmp(current_argv, long_options[i].name,
+ current_argv_len))
+ continue;
+
+ if (strlen(long_options[i].name) == current_argv_len) {
+ /* exact match */
+ match = i;
+ break;
+ }
+ /*
+ * If this is a known short option, don't allow
+ * a partial match of a single character.
+ */
+ if (short_too && current_argv_len == 1)
+ continue;
+
+ if (match == -1) /* partial match */
+ match = i;
+ else {
+ /* ambiguous abbreviation */
+ if (PRINT_ERROR)
+ warnx(ambig, (int)current_argv_len,
+ current_argv);
+ optopt = 0;
+ return (BADCH);
+ }
+ }
+ if (match != -1) { /* option found */
+ if (long_options[match].has_arg == no_argument
+ && has_equal) {
+ if (PRINT_ERROR)
+ warnx(noarg, (int)current_argv_len,
+ current_argv);
+ /*
+ * XXX: GNU sets optopt to val regardless of flag
+ */
+ if (long_options[match].flag == NULL)
+ optopt = long_options[match].val;
+ else
+ optopt = 0;
+ return (BADARG);
+ }
+ if (long_options[match].has_arg == required_argument ||
+ long_options[match].has_arg == optional_argument) {
+ if (has_equal)
+ optarg = has_equal;
+ else if (long_options[match].has_arg ==
+ required_argument) {
+ /*
+ * optional argument doesn't use next nargv
+ */
+ optarg = nargv[optind++];
+ }
+ }
+ if ((long_options[match].has_arg == required_argument)
+ && (optarg == NULL)) {
+ /*
+ * Missing argument; leading ':' indicates no error
+ * should be generated.
+ */
+ if (PRINT_ERROR)
+ warnx(recargstring,
+ current_argv);
+ /*
+ * XXX: GNU sets optopt to val regardless of flag
+ */
+ if (long_options[match].flag == NULL)
+ optopt = long_options[match].val;
+ else
+ optopt = 0;
+ --optind;
+ return (BADARG);
+ }
+ } else { /* unknown option */
+ if (short_too) {
+ --optind;
+ return (-1);
+ }
+ if (PRINT_ERROR)
+ warnx(illoptstring, current_argv);
+ optopt = 0;
+ return (BADCH);
+ }
+ if (idx)
+ *idx = match;
+ if (long_options[match].flag) {
+ *long_options[match].flag = long_options[match].val;
+ return (0);
+ } else
+ return (long_options[match].val);
+}
+
+/*
+ * getopt_internal --
+ * Parse argc/argv argument vector. Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+ const struct option *long_options, int *idx, int flags)
+{
+ char *oli; /* option letter list index */
+ int optchar, short_too;
+
+ if (options == NULL)
+ return (-1);
+
+ /*
+ * Disable GNU extensions if posixly_correct is set or options
+ * string begins with a '+'.
+ */
+ if (posixly_correct || *options == '+')
+ flags &= ~FLAG_PERMUTE;
+ else if (*options == '-')
+ flags |= FLAG_ALLARGS;
+ if (*options == '+' || *options == '-')
+ options++;
+
+ /*
+ * XXX Some GNU programs (like cvs) set optind to 0 instead of
+ * XXX using optreset. Work around this braindamage.
+ */
+ if (optind == 0)
+ optind = optreset = 1;
+
+ optarg = NULL;
+ if (optreset)
+ nonopt_start = nonopt_end = -1;
+start:
+ if (optreset || !*place) { /* update scanning pointer */
+ optreset = 0;
+ if (optind >= nargc) { /* end of argument vector */
+ place = EMSG;
+ if (nonopt_end != -1) {
+ /* do permutation, if we have to */
+ permute_args(nonopt_start, nonopt_end,
+ optind, nargv);
+ optind -= nonopt_end - nonopt_start;
+ }
+ else if (nonopt_start != -1) {
+ /*
+ * If we skipped non-options, set optind
+ * to the first of them.
+ */
+ optind = nonopt_start;
+ }
+ nonopt_start = nonopt_end = -1;
+ return (-1);
+ }
+ if (*(place = nargv[optind]) != '-' ||
+ (place[1] == '\0' && strchr(options, '-') == NULL)) {
+ place = EMSG; /* found non-option */
+ if (flags & FLAG_ALLARGS) {
+ /*
+ * GNU extension:
+ * return non-option as argument to option 1
+ */
+ optarg = nargv[optind++];
+ return (INORDER);
+ }
+ if (!(flags & FLAG_PERMUTE)) {
+ /*
+ * If no permutation wanted, stop parsing
+ * at first non-option.
+ */
+ return (-1);
+ }
+ /* do permutation */
+ if (nonopt_start == -1)
+ nonopt_start = optind;
+ else if (nonopt_end != -1) {
+ permute_args(nonopt_start, nonopt_end,
+ optind, nargv);
+ nonopt_start = optind -
+ (nonopt_end - nonopt_start);
+ nonopt_end = -1;
+ }
+ optind++;
+ /* process next argument */
+ goto start;
+ }
+ if (nonopt_start != -1 && nonopt_end == -1)
+ nonopt_end = optind;
+
+ /*
+ * If we have "-" do nothing, if "--" we are done.
+ */
+ if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+ optind++;
+ place = EMSG;
+ /*
+ * We found an option (--), so if we skipped
+ * non-options, we have to permute.
+ */
+ if (nonopt_end != -1) {
+ permute_args(nonopt_start, nonopt_end,
+ optind, nargv);
+ optind -= nonopt_end - nonopt_start;
+ }
+ nonopt_start = nonopt_end = -1;
+ return (-1);
+ }
+ }
+
+ /*
+ * Check long options if:
+ * 1) we were passed some
+ * 2) the arg is not just "-"
+ * 3) either the arg starts with -- we are getopt_long_only()
+ */
+ if (long_options != NULL && place != nargv[optind] &&
+ (*place == '-' || (flags & FLAG_LONGONLY))) {
+ short_too = 0;
+ if (*place == '-')
+ place++; /* --foo long option */
+ else if (*place != ':' && strchr(options, *place) != NULL)
+ short_too = 1; /* could be short option too */
+
+ optchar = parse_long_options(nargv, options, long_options,
+ idx, short_too);
+ if (optchar != -1) {
+ place = EMSG;
+ return (optchar);
+ }
+ }
+
+ if ((optchar = (int)*place++) == (int)':' ||
+ (optchar == (int)'-' && *place != '\0') ||
+ (oli = strchr(options, optchar)) == NULL) {
+ /*
+ * If the user specified "-" and '-' isn't listed in
+ * options, return -1 (non-option) as per POSIX.
+ * Otherwise, it is an unknown option character (or ':').
+ */
+ if (optchar == (int)'-' && *place == '\0')
+ return (-1);
+ if (!*place)
+ ++optind;
+ if (PRINT_ERROR)
+ warnx(illoptchar, optchar);
+ optopt = optchar;
+ return (BADCH);
+ }
+ if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+ /* -W long-option */
+ if (*place) /* no space */
+ /* NOTHING */;
+ else if (++optind >= nargc) { /* no arg */
+ place = EMSG;
+ if (PRINT_ERROR)
+ warnx(recargchar, optchar);
+ optopt = optchar;
+ return (BADARG);
+ } else /* white space */
+ place = nargv[optind];
+ optchar = parse_long_options(nargv, options, long_options,
+ idx, 0);
+ place = EMSG;
+ return (optchar);
+ }
+ if (*++oli != ':') { /* doesn't take argument */
+ if (!*place)
+ ++optind;
+ } else { /* takes (optional) argument */
+ optarg = NULL;
+ if (*place) /* no white space */
+ optarg = place;
+ else if (oli[1] != ':') { /* arg not optional */
+ if (++optind >= nargc) { /* no arg */
+ place = EMSG;
+ if (PRINT_ERROR)
+ warnx(recargchar, optchar);
+ optopt = optchar;
+ return (BADARG);
+ } else
+ optarg = nargv[optind];
+ }
+ place = EMSG;
+ ++optind;
+ }
+ /* dump back option letter */
+ return (optchar);
+}
+
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ * Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+
+ /*
+ * We don't pass FLAG_PERMUTE to getopt_internal() since
+ * the BSD getopt(3) (unlike GNU) has never done this.
+ *
+ * Furthermore, since many privileged programs call getopt()
+ * before dropping privileges it makes sense to keep things
+ * as simple (and bug-free) as possible.
+ */
+ return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+#endif /* REPLACE_GETOPT */
+
+/*
+ * getopt_long --
+ * Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+ const struct option *long_options, int *idx)
+{
+
+ return (getopt_internal(nargc, nargv, options, long_options, idx,
+ FLAG_PERMUTE));
+}
+
+/*
+ * getopt_long_only --
+ * Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+ const struct option *long_options, int *idx)
+{
+
+ return (getopt_internal(nargc, nargv, options, long_options, idx,
+ FLAG_PERMUTE|FLAG_LONGONLY));
+}
--- libc/Makefile.inc (.../branches/upstream/libpayload)
+++ libc/Makefile.inc (.../trunk/libpayload)
@@ -31,4 +31,4 @@
TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o
libc/string.o
TARGETS-$(CONFIG_LIBC) += libc/memory.o libc/ctype.o libc/ipchecksum.o
libc/lib.o
TARGETS-$(CONFIG_LIBC) += libc/rand.o libc/time.o libc/lar.o libc/exec.o
-TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/sysinfo.o
+TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/getopt_long.o libc/sysinfo.o
working memalign version for libpayload. This fixes problems with the USB stack
in FILO.
Signed-off-by: Stefan Reinauer <[email protected]>
--- libc/malloc.c (.../branches/upstream/libpayload)
+++ libc/malloc.c (.../trunk/libpayload)
@@ -63,6 +63,7 @@
#define IS_FREE(_h) (((_h) & (MAGIC | FLAG_FREE)) == (MAGIC | FLAG_FREE))
#define HAS_MAGIC(_h) (((_h) & MAGIC) == MAGIC)
+static int free_aligned(void* addr);
void print_malloc_map(void);
static void setup(void)
@@ -72,7 +73,7 @@
*((hdrtype_t *) hstart) = FREE_BLOCK(size);
}
-static void *alloc(int len, int align)
+static void *alloc(int len)
{
hdrtype_t header;
void *ptr = hstart;
@@ -92,20 +93,13 @@
header = *((hdrtype_t *) ptr);
int size = SIZE(header);
- if (!HAS_MAGIC(header)) {
+ if (!HAS_MAGIC(header) || size == 0) {
printf("memory allocator panic.\n");
halt();
}
if (header & FLAG_FREE) {
- int realaddr = (int)(ptr + HDRSIZE);
- int overhead = ((realaddr+align-1) & ~(align-1)) -
realaddr;
- if (len + overhead <= size) {
- if (overhead != 0) {
- *((hdrtype_t *) ptr) =
FREE_BLOCK(overhead - HDRSIZE);
- ptr += overhead;
- size -= overhead;
- }
+ if (len <= size) {
void *nptr = ptr + (HDRSIZE + len);
int nsize = size - (HDRSIZE + len);
@@ -171,6 +165,8 @@
{
hdrtype_t hdr;
+ if (free_aligned(ptr)) return;
+
ptr -= HDRSIZE;
/* Sanity check. */
@@ -193,13 +189,13 @@
void *malloc(size_t size)
{
- return alloc(size, 1);
+ return alloc(size);
}
void *calloc(size_t nmemb, size_t size)
{
size_t total = nmemb * size;
- void *ptr = alloc(total, 1);
+ void *ptr = alloc(total);
if (ptr)
memset(ptr, 0, total);
@@ -213,7 +209,7 @@
unsigned int osize;
if (ptr == NULL)
- return alloc(size, 1);
+ return alloc(size);
pptr = ptr - HDRSIZE;
@@ -229,7 +225,7 @@
* reallocated the new space.
*/
free(ptr);
- ret = alloc(size, 1);
+ ret = alloc(size);
/*
* if ret == NULL, then doh - failure.
@@ -244,23 +240,114 @@
return ret;
}
-/**
- * Allocate an aligned chunk of memory
- *
- * @param align alignment, must be power of two
- * @param size size of chunk in bytes
- * @return Return the address of such a memory region or NULL
- */
+struct align_region_t
+{
+ int alignment;
+ /* start in memory, and size in bytes */
+ void* start;
+ int size;
+ /* layout within a region:
+ - num_elements bytes, 0: free, 1: used, 2: used, combines with next
+ - padding to alignment
+ - data section
+ - waste space
+
+ start_data points to the start of the data section
+ */
+ void* start_data;
+ /* number of free blocks sized "alignment" */
+ int free;
+ struct align_region_t *next;
+};
+
+static struct align_region_t* align_regions = 0;
+
+static struct align_region_t *allocate_region(struct align_region_t
*old_first, int alignment, int num_elements)
+{
+ struct align_region_t *new_region = malloc(sizeof(struct
align_region_t));
+ new_region->alignment = alignment;
+ new_region->start = malloc((num_elements+1) * alignment + num_elements);
+ new_region->start_data = (void*)((u32)(new_region->start + num_elements
+ alignment - 1) & (~(alignment-1)));
+ new_region->size = num_elements * alignment;
+ new_region->free = num_elements;
+ new_region->next = old_first;
+ memset(new_region->start, 0, num_elements);
+ return new_region;
+}
+
+
+static int free_aligned(void* addr)
+{
+ struct align_region_t *reg = align_regions;
+ while (reg != 0)
+ {
+ if ((addr >= reg->start_data) && (addr < reg->start_data +
reg->size))
+ {
+ int i = (addr-reg->start_data)/reg->alignment;
+ while (((u8*)reg->start)[i]==2)
+ {
+ ((u8*)reg->start)[i++]=0;
+ reg->free++;
+ }
+ ((u8*)reg->start)[i]=0;
+ reg->free++;
+ return 1;
+ }
+ reg = reg->next;
+ }
+ return 0;
+}
+
void *memalign(size_t align, size_t size)
{
- return alloc(size, align);
+ if (size == 0) return 0;
+ if (align_regions == 0) {
+ align_regions = malloc(sizeof(struct align_region_t));
+ memset(align_regions, 0, sizeof(struct align_region_t));
+ }
+ struct align_region_t *reg = align_regions;
+look_further:
+ while (reg != 0)
+ {
+ if ((reg->alignment == align) && (reg->free >= (size + align -
1)/align))
+ {
+ break;
+ }
+ reg = reg->next;
+ }
+ if (reg == 0)
+ {
+ align_regions = allocate_region(align_regions, align,
(size/align<99)?100:((size/align)+1));
+ reg = align_regions;
+ }
+ int i, count = 0, target = (size+align-1)/align;
+ for (i = 0; i < (reg->size/align); i++)
+ {
+ if (((u8*)reg->start)[i] == 0)
+ {
+ count++;
+ if (count == target) {
+ count = i+1-count;
+ for (i=0; i<target-1; i++)
+ {
+ ((u8*)reg->start)[count+i]=2;
+ }
+ ((u8*)reg->start)[count+target-1]=1;
+ reg->free -= target;
+ return reg->start_data+(align*count);
+ }
+ } else {
+ count = 0;
+ }
+ }
+ goto look_further; // end condition is once a new region is allocated -
it always has enough space
}
/* This is for debugging purposes. */
#ifdef TEST
void print_malloc_map(void)
{
-void *ptr = hstart;
+ void *ptr = hstart;
while (ptr < hend) {
hdrtype_t hdr = *((hdrtype_t *) ptr);
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
