patch and request

[Bas Wijnen]

Hello again,

Below is a patch for the two bugs I reported yesterday.  Furthermore, I have
a request:

To try some things out, I want to make a boot floppy which starts, for
example, the "demo system" mentioned in wortel/README.  I can probably find
out how to do it, but it would be nice to have a document which describes how
it is done, and why every step is taken.  If someone who knows would write
that, I think it would be nice for newcomers like myself to learn about the
system.  If not, I think I'll check it out and write it myself.

Bye,
Bas Wijnen


ChangeLog entry:

2003-09-18  Bas Wijnen  <address@hidden>

        * laden/ia32-cmain.c: Changed incorrect 0x2ff to ((1 << 10) - 1).
        * laden/laden.c: Updated help text to match program functionality.


Index: laden/ia32-cmain.c
===================================================================
RCS file: /cvsroot/hurd/hurd-l4/laden/ia32-cmain.c,v
retrieving revision 1.9
diff -u -r1.9 ia32-cmain.c
--- laden/ia32-cmain.c  15 Sep 2003 19:24:01 -0000      1.9
+++ laden/ia32-cmain.c  18 Sep 2003 09:32:39 -0000
@@ -258,10 +258,10 @@
   else if (CHECK_FLAG (mbi->flags, 0))
     {
       /* mem_* are valid.  */
-      if (mbi->mem_lower & 0x2ff)
+      if (mbi->mem_lower & ((1 << 10) - 1))
        panic ("Lower memory end address 0x%x is unaligned",
               mbi->mem_lower);
-      if (mbi->mem_upper & 0x2ff)
+      if (mbi->mem_upper & ((1 << 10) - 1))
        panic ("Upper memory end address 0x%x is unaligned",
               mbi->mem_upper);
 
Index: laden/laden.c
===================================================================
RCS file: /cvsroot/hurd/hurd-l4/laden/laden.c,v
retrieving revision 1.6
diff -u -r1.6 laden.c
--- laden/laden.c       8 Sep 2003 14:23:17 -0000       1.6
+++ laden/laden.c       18 Sep 2003 09:32:39 -0000
@@ -129,7 +129,7 @@
                  "  -o, --output DRV  use output driver DRV\n"
                  "  -D, --debug       enable debug output\n"
                  "  -h, --halt        halt the system at error (default)\n"
-                 "  -r, --reboot      reboot the system at error\n"
+                 "  -r, --reset       reset the system at error\n"
                  "\n"
                  "      --usage       print out some usage information and "
                  "exit\n"