From owner-svn-src-all@freebsd.org Wed Feb 7 19:21:00 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E27F4F1EB9C; Wed, 7 Feb 2018 19:20:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94ABE7A097; Wed, 7 Feb 2018 19:20:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F9722FDB; Wed, 7 Feb 2018 19:20:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w17JKxjC071171; Wed, 7 Feb 2018 19:20:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w17JKx8m071168; Wed, 7 Feb 2018 19:20:59 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802071920.w17JKx8m071168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 7 Feb 2018 19:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328990 - in head/stand/usb: . test X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/stand/usb: . test X-SVN-Commit-Revision: 328990 X-SVN-Commit-Repository: base 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.25 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: Wed, 07 Feb 2018 19:21:00 -0000 Author: hselasky Date: Wed Feb 7 19:20:59 2018 New Revision: 328990 URL: https://svnweb.freebsd.org/changeset/base/328990 Log: Move the stand/usb test loader into its own directory. Fix its Makefile to build correctly. MFC after: 1 week Sponsored by: Mellanox Technologies Added: head/stand/usb/test/ head/stand/usb/test/Makefile - copied, changed from r328989, head/stand/usb/Makefile.test head/stand/usb/test/bsd_usbloader_test.c - copied unchanged from r328989, head/stand/usb/bsd_usbloader_test.c Deleted: head/stand/usb/Makefile.test head/stand/usb/bsd_usbloader_test.c Copied and modified: head/stand/usb/test/Makefile (from r328989, head/stand/usb/Makefile.test) ============================================================================== --- head/stand/usb/Makefile.test Wed Feb 7 19:12:05 2018 (r328989, copy source) +++ head/stand/usb/test/Makefile Wed Feb 7 19:20:59 2018 (r328990) @@ -30,6 +30,7 @@ # .PATH: ${.CURDIR} +.SUFFIXES: .a PROG= usbloader SRCS= @@ -45,12 +46,15 @@ LDFLAGS+= -Wl,--gc-sections SRCS+= bsd_usbloader_test.c -LDADD+= libusbboot.a -DPADD+= libusbboot.a +USBLIB?= ${.OBJDIR}/../libusbboot.a +LDADD+= ${USBLIB} +DPADD+= ${USBLIB} + +MAN= + .include -${PROG}: libusbboot.a +${USBLIB}: + make -C ${.CURDIR}/.. USBCOREDIR=${.CURDIR}/.. -libusbboot.a: - make -f Makefile Copied: head/stand/usb/test/bsd_usbloader_test.c (from r328989, head/stand/usb/bsd_usbloader_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/stand/usb/test/bsd_usbloader_test.c Wed Feb 7 19:20:59 2018 (r328990, copy of r328989, head/stand/usb/bsd_usbloader_test.c) @@ -0,0 +1,101 @@ +/* $FreeBSD$ */ +/*- + * Copyright (c) 2013 Hans Petter Selasky. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +extern int usleep(int); +extern void callout_process(int); +extern void usb_idle(void); +extern void usb_init(void); +extern void usb_uninit(void); + +#define hz 1000 + +#ifdef HAVE_MALLOC +void * +usb_malloc(size_t size) +{ + return (malloc(size)); +} + +void +usb_free(void *ptr) +{ + free(ptr); +} +#endif + +void +DELAY(unsigned int delay) +{ + usleep(delay); +} + +void +delay(unsigned int delay) +{ + usleep(delay); +} + +int +pause(const char *what, int timeout) +{ + if (timeout == 0) + timeout = 1; + + usleep((1000000 / hz) * timeout); + + return (0); +} + +int +main(int argc, char **argv) +{ + uint32_t time; + + usb_init(); + + time = 0; + + while (1) { + + usb_idle(); + + usleep(1000); + + if (++time >= (1000 / hz)) { + time = 0; + callout_process(1); + } + } + + usb_uninit(); + + return (0); +}