Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 7 Feb 2018 19:20:59 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328990 - in head/stand/usb: . test
Message-ID:  <201802071920.w17JKx8m071168@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <bsd.prog.mk>
 
-${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 <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <time.h>
+
+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);
+}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802071920.w17JKx8m071168>