From owner-svn-src-user@FreeBSD.ORG Fri Jan 18 14:36:24 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 90B52318; Fri, 18 Jan 2013 14:36:24 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7DB9ABDB; Fri, 18 Jan 2013 14:36:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0IEaOmf025789; Fri, 18 Jan 2013 14:36:24 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0IEaORX025787; Fri, 18 Jan 2013 14:36:24 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201301181436.r0IEaORX025787@svn.freebsd.org> From: Sean Bruno Date: Fri, 18 Jan 2013 14:36:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245605 - in user/sbruno/pxestuff/sys/boot/i386: btx/btx libi386 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 14:36:24 -0000 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