From a73f7cf01fb57722a19b5d090f83ef40dd4c7da8 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 7 Jan 1999 23:07:57 +0000
Subject: Major synchronisation with NetBSD USB code

---
 sys/dev/usb/hid.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'sys/dev/usb/hid.c')

diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index a96da40d298e..b03f749ddedf 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,12 +1,13 @@
-/*	$NetBSD: hid.c,v 1.2 1998/07/24 20:57:46 augustss Exp $	*/
-/*	FreeBSD $Id: hid.c,v 1.2 1998/12/14 09:32:23 n_hibma Exp $ */
+/*	$NetBSD: hid.c,v 1.5 1998/12/26 12:53:00 augustss Exp $	*/
+/*	FreeBSD $Id$ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
- * Author: Lennart Augustsson <augustss@carlstedt.se>
- *         Carlstedt Research & Technology
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (augustss@carlstedt.se) at
+ * Carlstedt Research & Technology.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,12 +38,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <dev/usb/usb_port.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#if defined(__FreeBSD__)
+#include <sys/bus.h>
+#endif
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
@@ -442,8 +444,8 @@ hid_get_data(buf, loc)
 	hsize = 32 - hsize;
 	/* Sign extend */
 	data = ((int32_t)data << hsize) >> hsize;
-	DPRINTFN(10, ("hid_get_data: loc %d/%d = %lu\n", 
-		 loc->pos, loc->size, (long)data));
+	DPRINTFN(10,("hid_get_data: loc %d/%d = %lu\n", 
+		    loc->pos, loc->size, (long)data));
 	return (data);
 }
 
-- 
cgit v1.3