rpms/grub/devel grub-0.97-efipxe.patch,1.4,1.5

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24466

Modified Files:
	grub-0.97-efipxe.patch 
Log Message:
Fix accidental reversion.


grub-0.97-efipxe.patch:

Index: grub-0.97-efipxe.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-0.97-efipxe.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-0.97-efipxe.patch	7 Apr 2009 20:06:15 -0000	1.4
+++ grub-0.97-efipxe.patch	7 Apr 2009 21:19:42 -0000	1.5
@@ -1,4 +1,4 @@
-From feede446fb63401cdf36860427bc9feb7e903596 Mon Sep 17 00:00:00 2001
+From 4c6bf1cd9fcf484aa777e68be391c17f011f4f7f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
 Date: Tue, 31 Mar 2009 14:55:00 +0500
 Subject: [PATCH] add basic pxe boot support in efi
@@ -12,7 +12,7 @@
  efi/efimisc.c      |   14 +-
  efi/efitftp.c      |  179 +++++++++++++++++++++
  efi/grub/efi/efi.h |    6 +
- efi/pxe.c          |  440 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ efi/pxe.c          |  445 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  efi/pxe.h          |  237 ++++++++++++++++++++++++++++
  grub/Makefile.am   |    2 +-
  grub/efitftp.c     |   34 ++++
@@ -21,7 +21,7 @@
  stage2/efistubs.c  |    7 +
  stage2/efistubs.h  |    8 +
  stage2/filesys.h   |   13 ++-
- 17 files changed, 1160 insertions(+), 26 deletions(-)
+ 17 files changed, 1165 insertions(+), 26 deletions(-)
  create mode 100644 efi/byteswap.h
  create mode 100644 efi/dhcp.h
  create mode 100644 efi/efitftp.c
@@ -545,10 +545,10 @@
  grub_efi_handle_t *grub_efi_locate_handle (grub_efi_locate_search_type_t
 diff --git a/efi/pxe.c b/efi/pxe.c
 new file mode 100644
-index 0000000..1863813
+index 0000000..8a15f20
 --- /dev/null
 +++ b/efi/pxe.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,445 @@
 +
 +#include <grub/efi/efi.h>
 +#include <grub/efi/api.h>
@@ -590,8 +590,9 @@
 +static void dhcp_option_parser_reset(dhcp_option_parser *parser,
 +				EFI_PXE_BASE_CODE_PACKET *packet)
 +{
-+	grub_uint64_t addr = (grub_uint64_t)packet;
++	char *addr;
 +
++	addr = (char *)packet;
 +	addr += offsetof(EFI_PXE_BASE_CODE_DHCPV4_PACKET, DhcpOptions);
 +	parser->current_option = (void *)addr;
 +	parser->options = (void *)addr;
@@ -600,11 +601,15 @@
 +static int dhcp_option_parser_next(dhcp_option_parser *parser,
 +				EFI_DHCP4_PACKET_OPTION **option)
 +{
++	char *current_option;
 +	if (parser->current_option->OpCode == 255) {
 +		*option = NULL;
 +		return 0;
 +	}
-+	parser->current_option = (void *)((grub_uint64_t)parser->current_option + 2 + parser->current_option->Length);
++	current_option = (char *)parser->current_option;
++	current_option += 2 + parser->current_option->Length;
++	parser->current_option = (EFI_DHCP4_PACKET_OPTION *)current_option;
++
 +	*option = parser->current_option;
 +	return 1;
 +}
@@ -886,7 +891,7 @@
 +	char *FileName = NULL;
 +	EFI_PXE_BASE_CODE_DHCPV4_PACKET *packet;
 +	uuid_t uuid;
-+	size_t FileSize = 0;
++	grub_efi_uintn_t FileSize = 0;
 +	grub_efi_status_t rc = GRUB_EFI_SUCCESS;
 +	char *ConfigPath = NULL;
 +	char hex[] = "0123456789ABCDEF";