From owner-svn-src-all@FreeBSD.ORG Fri May 30 16:49:13 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 037C7F59; Fri, 30 May 2014 16:49:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4FA72961; Fri, 30 May 2014 16:49:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UGnC1A055918; Fri, 30 May 2014 16:49:12 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UGnCql055914; Fri, 30 May 2014 16:49:12 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201405301649.s4UGnCql055914@svn.freebsd.org> From: Hans Petter Selasky Date: Fri, 30 May 2014 16:49:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266894 - head/sys/boot/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 16:49:13 -0000 Author: hselasky Date: Fri May 30 16:49:12 2014 New Revision: 266894 URL: http://svnweb.freebsd.org/changeset/base/266894 Log: Use own memory pool of 128K until further, hence that works the best. Sponsored by: DARPA, AFRL Modified: head/sys/boot/usb/Makefile head/sys/boot/usb/bsd_usbloader_test.c Modified: head/sys/boot/usb/Makefile ============================================================================== --- head/sys/boot/usb/Makefile Fri May 30 16:47:54 2014 (r266893) +++ head/sys/boot/usb/Makefile Fri May 30 16:49:12 2014 (r266894) @@ -53,10 +53,9 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../common CFLAGS+= -g CFLAGS+= -DUSB_MSCTEST_BULK_SIZE=65536 -CFLAGS+= -DUSB_POOL_SIZE=262144 +CFLAGS+= -DUSB_POOL_SIZE=131072 CFLAGS+= -fno-pic CFLAGS+= -DHAVE_ENDIAN_DEFS -CFLAGS+= -DHAVE_MALLOC .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -march=i386 Modified: head/sys/boot/usb/bsd_usbloader_test.c ============================================================================== --- head/sys/boot/usb/bsd_usbloader_test.c Fri May 30 16:47:54 2014 (r266893) +++ head/sys/boot/usb/bsd_usbloader_test.c Fri May 30 16:49:12 2014 (r266894) @@ -37,6 +37,7 @@ extern void usb_uninit(void); #define hz 1000 +#ifdef HAVE_MALLOC void * usb_malloc(size_t size) { @@ -48,6 +49,7 @@ usb_free(void *ptr) { free(ptr); } +#endif void DELAY(unsigned int delay)