svn commit: r245605 - in user/sbruno/pxestuff/sys/boot/i386: btx/btx libi386

[Sean Bruno]

Author: sbruno
Date: Fri Jan 18 14:36:23 2013
New Revision: 245605
URL: http://svnweb.freebsd.org/changeset/base/245605

Log:
  btx.S
  -  Probably not a good idea to write the crash message randomly.
  	(jiles)
  
  pxe.c
  -  Move some white space around to show that the new code is being
     run at the same point as old code in the #ifdef

Modified:
  user/sbruno/pxestuff/sys/boot/i386/btx/btx/btx.S
  user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.c

Modified: user/sbruno/pxestuff/sys/boot/i386/btx/btx/btx.S
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/btx/btx/btx.S	Fri Jan 18 13:16:02 2013	(r245604)
+++ user/sbruno/pxestuff/sys/boot/i386/btx/btx/btx.S	Fri Jan 18 14:36:23 2013	(r245605)
@@ -368,6 +368,7 @@ except.2:	pushl 0x50(%esp,1)		# Set ESP
 		popl %es			#  data
 		movl %esp,%ebx			# Stack frame
 		movl $dmpfmt,%esi		# Dump format string
+		movl $MEM_BUF,%edi              # Buffer
 		pushl %edi			# Dump to
 		call dump			#  buffer
 		popl %esi			#  and

Modified: user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.c
==============================================================================
--- user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.c	Fri Jan 18 13:16:02 2013	(r245604)
+++ user/sbruno/pxestuff/sys/boot/i386/libi386/pxe.c	Fri Jan 18 14:36:23 2013	(r245605)
@@ -296,11 +296,11 @@ pxe_open(struct open_file *f, ...)
 	}
 	if (rootip.s_addr == 0) {
 #ifdef PXEHTTP_UDP_FOR_LIBSTAND
-			gateip.s_addr = pxe_get_ip(PXE_IP_GATEWAY)->ip;
-			rootip.s_addr = pxe_get_ip(PXE_IP_ROOT)->ip;
-			netmask = pxe_get_ip(PXE_IP_NETMASK)->ip;
-			myip.s_addr = pxe_get_ip(PXE_IP_MY)->ip;
-			nameip.s_addr = pxe_get_ip(PXE_IP_NAMESERVER)->ip;
+		gateip.s_addr = pxe_get_ip(PXE_IP_GATEWAY)->ip;
+		rootip.s_addr = pxe_get_ip(PXE_IP_ROOT)->ip;
+		netmask = pxe_get_ip(PXE_IP_NETMASK)->ip;
+		myip.s_addr = pxe_get_ip(PXE_IP_MY)->ip;
+		nameip.s_addr = pxe_get_ip(PXE_IP_NAMESERVER)->ip;
 #else
 		/*
 		 * Do a bootp/dhcp request to find out where our