Page MenuHomeFreeBSD
Differential D2593 Diff 5799 sys/boot/i386/boot2/boot2.c

Changeset View

Standalone View

View Options

sys/boot/i386/boot2/boot2.c

Show First 20 Lines • Show All 430 Lines • ▼ Show 20 Lines for (i = 0; c != optstr[i]; i++)
if (i == NOPT - 1) if (i == NOPT - 1)
return -1; return -1;
opts ^= OPT_SET(flags[i]); opts ^= OPT_SET(flags[i]);
} }
#if SERIAL #if SERIAL
ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) :
OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD;
if (DO_SIO) { if (DO_SIO) {
if (sio_init(115200 / comspeed) != 0) /* If comspeed is set to 0, assume serial port has already
impUnsubmitted
Done
Inline Actions

Style nit:
/*

  • Long comments */

and

/* Short comments */

But never

/* This is a comment
*/

Please use the long format.

imp: Style nit: /* * Long comments */ and /* Short comments */ But never /* This is a comment…
thomasAuthorUnsubmitted
Not Done
Inline Actions

Thanks, done in my local copy (however note that as mentioned in a previous comment, in any case I do NOT intend to commit this hunk as part of the pmbr change, it is independent, and got included here by mistake).

thomas: Thanks, done in my local copy (however note that as mentioned in a previous comment, in any…
* been initialized in a previous boot stage.
*/
if (comspeed != 0 && sio_init(115200 / comspeed) != 0)
ioctrl &= ~IO_SERIAL; ioctrl &= ~IO_SERIAL;
} }
#endif #endif
} else { } else {
for (q = arg--; *q && *q != '('; q++); for (q = arg--; *q && *q != '('; q++);
if (*q) { if (*q) {
drv = -1; drv = -1;
if (arg[1] == ':') { if (arg[1] == ':') {
▲ Show 20 Lines • Show All 238 Lines • Show Last 20 Lines