[1961] 2009-01-27 Vesa J?\195?\164?\195?\164skel?\195?\164inen <chaac@nic .fi>

Revision: 1961
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1961
Author:   chaac
Date:     2009-01-27 19:07:32 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
2009-01-27  Vesa J?\195?\164?\195?\164skel?\195?\164inen  <[email protected]>

	* commands/lsmmap.c: Add include to grub/machine/memory.h.

	* fs/i386/pc/pxe.c (grub_pxefs_open): Fix sign problem.

	* term/i386/pc/at_keyboard.c (GRUB_MOD_FINI(at_keyboard)): Use proper
	unregister function.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/commands/lsmmap.c
    trunk/grub2/fs/i386/pc/pxe.c
    trunk/grub2/term/i386/pc/at_keyboard.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-01-27 18:26:09 UTC (rev 1960)
+++ trunk/grub2/ChangeLog	2009-01-27 19:07:32 UTC (rev 1961)
@@ -1,5 +1,14 @@
 2009-01-27  Vesa Jääskeläinen  <[email protected]>
 
+	* commands/lsmmap.c: Add include to grub/machine/memory.h.
+
+	* fs/i386/pc/pxe.c (grub_pxefs_open): Fix sign problem.
+
+	* term/i386/pc/at_keyboard.c (GRUB_MOD_FINI(at_keyboard)): Use proper
+	unregister function.
+
+2009-01-27  Vesa Jääskeläinen  <[email protected]>
+
 	* disk/scsi.c (grub_scsi_read): Fix sign problem.
 
 	* term/i386/pc/vga_text.c (grub_vga_text_init_fini). Fix declaration.

Modified: trunk/grub2/commands/lsmmap.c
===================================================================
--- trunk/grub2/commands/lsmmap.c	2009-01-27 18:26:09 UTC (rev 1960)
+++ trunk/grub2/commands/lsmmap.c	2009-01-27 19:07:32 UTC (rev 1961)
@@ -16,6 +16,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/machine/memory.h>
 #include <grub/normal.h>
 #include <grub/dl.h>
 #include <grub/arg.h>
@@ -34,7 +35,7 @@
       return 0;
     }
   grub_machine_mmap_iterate (hook);
-  
+
   return 0;
 }
 

Modified: trunk/grub2/fs/i386/pc/pxe.c
===================================================================
--- trunk/grub2/fs/i386/pc/pxe.c	2009-01-27 18:26:09 UTC (rev 1960)
+++ trunk/grub2/fs/i386/pc/pxe.c	2009-01-27 19:07:32 UTC (rev 1961)
@@ -133,7 +133,7 @@
 
   c.c1.server_ip = grub_pxe_server_ip;
   c.c1.gateway_ip = grub_pxe_gateway_ip;
-  grub_strcpy (c.c1.filename, name);
+  grub_strcpy ((char *)&c.c1.filename[0], name);
   grub_pxe_call (GRUB_PXENV_TFTP_GET_FSIZE, &c.c1);
   if (c.c1.status)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
@@ -201,7 +201,7 @@
 
       o.server_ip = grub_pxe_server_ip;
       o.gateway_ip = grub_pxe_gateway_ip;
-      grub_strcpy (o.filename, data->filename);
+      grub_strcpy ((char *)&o.filename[0], data->filename);
       o.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
       o.packet_size = data->block_size;
       grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o);

Modified: trunk/grub2/term/i386/pc/at_keyboard.c
===================================================================
--- trunk/grub2/term/i386/pc/at_keyboard.c	2009-01-27 18:26:09 UTC (rev 1960)
+++ trunk/grub2/term/i386/pc/at_keyboard.c	2009-01-27 19:07:32 UTC (rev 1961)
@@ -231,5 +231,5 @@
 
 GRUB_MOD_FINI(at_keyboard)
 {
-  grub_term_unregister_output (&grub_at_keyboard_term);
+  grub_term_unregister_input (&grub_at_keyboard_term);
 }