socsvn commit: r257792 - in soc2013/syuu/bhyve_usb/usr.sbin/bhyve: . usb

[syuu at FreeBSD.org]

Author: syuu
Date: Sun Sep 29 17:57:56 2013
New Revision: 257792
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257792

Log:
  add combined-packet.c to Makefile

Modified:
  soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile
  soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c

Modified: soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile
==============================================================================
--- soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile	Sun Sep 29 15:19:34 2013	(r257791)
+++ soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile	Sun Sep 29 17:57:56 2013	(r257792)
@@ -19,7 +19,7 @@
 CFLAGS+=-I${.CURDIR}/usb/include -I${.CURDIR} 
 SRCS+=	core.c hcd-uhci.c host-libusb.c dev-hub.c
 .PATH: ${.CURDIR}/usb/gpl
-SRCS+=	desc.c dev-serial.c bus.c iov.c hexdump.c
+SRCS+=	desc.c dev-serial.c bus.c iov.c hexdump.c combined-packet.c
 
 NO_MAN=
 

Modified: soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c
==============================================================================
--- soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c	Sun Sep 29 15:19:34 2013	(r257791)
+++ soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c	Sun Sep 29 17:57:56 2013	(r257792)
@@ -1686,17 +1686,19 @@
 		usb_hub_class_initfn(&dev->klass, NULL);
 		usb_qdev_init(dev);
 	}
+#endif
 	{
 		USBDevice *dev = usb_serial_init(&sc->sc_st.bus);
 		usb_serial_class_initfn(&dev->klass, NULL);
 		usb_qdev_init(dev);
 	}
-#endif
+#if 0
 	{
 		USBDevice *dev = usb_host_init2(&sc->sc_st.bus);
 		usb_host_class_initfn(&dev->klass, NULL);
 		usb_qdev_init(dev);
 	}
+#endif
 
 	return (0);
 }