PERFORCE change 163370 for review
Andrew Thompson
thompsa at FreeBSD.org
Tue Jun 2 19:47:45 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=163370
Change 163370 by thompsa at thompsa_burger on 2009/06/02 19:47:34
IFC after updating branchspec for libusb and usbconfig
Affected files ...
.. //depot/projects/usb/src/lib/libusb/libusb.3#13 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20.c#4 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20.h#4 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_int.h#3 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#3 integrate
.. //depot/projects/usb/src/lib/libusbhid/descr.c#8 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/acl.h#4 branch
.. //depot/projects/usb/src/sys/dev/usb/README.TXT#3 delete
.. //depot/projects/usb/src/sys/powerpc/powerpc/uio_machdep.c#5 branch
.. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#5 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#12 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#7 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#5 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#15 integrate
Differences ...
==== //depot/projects/usb/src/lib/libusb/libusb.3#13 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $
+.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.5 2009/06/02 17:27:51 thompsa Exp $
.\"
.Dd May 28, 2009
.Dt LIBUSB 3
@@ -111,7 +111,7 @@
.Ft const char *
.Fn libusb20_dev_get_backend_name "struct libusb20_device *"
.Ft int
-.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo"
+.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo"
.Ft int
.Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len"
.Ft const char *
@@ -489,7 +489,7 @@
.Pp
.
.Fn libusb20_dev_get_info
-retrives the BSD specific usb2_device_info structure into the memory location given by
+retrives the BSD specific usb_device_info structure into the memory location given by
.Fa pinfo .
The USB device given by
.Fa pdev
==== //depot/projects/usb/src/lib/libusb/libusb20.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.3 2009/06/02 17:27:51 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -931,7 +931,7 @@
int
libusb20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (pinfo == NULL)
return (LIBUSB20_ERROR_INVALID_PARAM);
==== //depot/projects/usb/src/lib/libusb/libusb20.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.2 2009/03/17 21:20:39 delphij Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.4 2009/06/02 17:27:51 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
@@ -175,7 +175,7 @@
LIBUSB20_POWER_RESUME,
};
-struct usb2_device_info;
+struct usb_device_info;
struct libusb20_transfer;
struct libusb20_backend;
struct libusb20_backend_methods;
@@ -254,7 +254,7 @@
int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode);
uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev);
int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
-int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo);
int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev);
==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -49,7 +49,7 @@
typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_close_device_t)(struct libusb20_device *pdev);
-typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo);
typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe);
typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max);
==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -126,8 +126,8 @@
ugen20_enumerate(struct libusb20_device *pdev, const char *id)
{
const char *tmp = id;
- struct usb2_device_descriptor ddesc;
- struct usb2_device_info devinfo;
+ struct usb_device_descriptor ddesc;
+ struct usb_device_info devinfo;
uint32_t plugtime;
char buf[64];
int f;
@@ -213,7 +213,7 @@
}
struct ugen20_urd_state {
- struct usb2_read_dir urd;
+ struct usb_read_dir urd;
uint32_t nparsed;
int f;
uint8_t *ptr;
@@ -298,7 +298,7 @@
static void
ugen20_tr_release(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->nTransfer == 0) {
return;
@@ -316,8 +316,8 @@
static int
ugen20_tr_renew(struct libusb20_device *pdev)
{
- struct usb2_fs_init fs_init;
- struct usb2_fs_endpoint *pfse;
+ struct usb_fs_init fs_init;
+ struct usb_fs_endpoint *pfse;
int error;
uint32_t size;
uint16_t nMaxTransfer;
@@ -419,7 +419,7 @@
static int
ugen20_close_device(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->privBeData) {
memset(&fs_uninit, 0, sizeof(fs_uninit));
@@ -447,8 +447,8 @@
ugen20_get_config_desc_full(struct libusb20_device *pdev,
uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index)
{
- struct usb2_gen_descriptor gen_desc;
- struct usb2_config_descriptor cdesc;
+ struct usb_gen_descriptor gen_desc;
+ struct usb_config_descriptor cdesc;
uint8_t *ptr;
uint16_t len;
int error;
@@ -542,7 +542,7 @@
ugen20_set_alt_index(struct libusb20_device *pdev,
uint8_t iface_index, uint8_t alt_index)
{
- struct usb2_alt_interface alt_iface;
+ struct usb_alt_interface alt_iface;
memset(&alt_iface, 0, sizeof(alt_iface));
@@ -663,7 +663,7 @@
struct LIBUSB20_CONTROL_SETUP_DECODED *setup,
void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags)
{
- struct usb2_ctl_request req;
+ struct usb_ctl_request req;
memset(&req, 0, sizeof(req));
@@ -688,8 +688,8 @@
static int
ugen20_process(struct libusb20_device *pdev)
{
- struct usb2_fs_complete temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_complete temp;
+ struct usb_fs_endpoint *fsep;
struct libusb20_transfer *xfer;
while (1) {
@@ -739,8 +739,8 @@
ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize,
uint32_t MaxFrameCount, uint8_t ep_no)
{
- struct usb2_fs_open temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_open temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -772,7 +772,7 @@
static int
ugen20_tr_close(struct libusb20_transfer *xfer)
{
- struct usb2_fs_close temp;
+ struct usb_fs_close temp;
memset(&temp, 0, sizeof(temp));
@@ -787,7 +787,7 @@
static int
ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer)
{
- struct usb2_fs_clear_stall_sync temp;
+ struct usb_fs_clear_stall_sync temp;
memset(&temp, 0, sizeof(temp));
@@ -804,8 +804,8 @@
static void
ugen20_tr_submit(struct libusb20_transfer *xfer)
{
- struct usb2_fs_start temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_start temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -839,7 +839,7 @@
static void
ugen20_tr_cancel_async(struct libusb20_transfer *xfer)
{
- struct usb2_fs_stop temp;
+ struct usb_fs_stop temp;
memset(&temp, 0, sizeof(temp));
@@ -876,7 +876,7 @@
ugen20_dev_get_iface_desc(struct libusb20_device *pdev,
uint8_t iface_index, char *buf, uint8_t len)
{
- struct usb2_gen_descriptor ugd;
+ struct usb_gen_descriptor ugd;
memset(&ugd, 0, sizeof(ugd));
@@ -892,7 +892,7 @@
static int
ugen20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) {
return (LIBUSB20_ERROR_INVALID_PARAM);
@@ -904,7 +904,7 @@
ugen20_root_get_dev_quirk(struct libusb20_backend *pbe,
uint16_t quirk_index, struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -931,7 +931,7 @@
ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -954,7 +954,7 @@
ugen20_root_add_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -978,7 +978,7 @@
ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
==== //depot/projects/usb/src/lib/libusbhid/descr.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $");
+__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $");
#include <sys/types.h>
@@ -76,7 +76,7 @@
report_desc_t
hid_get_report_desc(int fd)
{
- struct usb2_gen_descriptor ugd;
+ struct usb_gen_descriptor ugd;
report_desc_t rep;
void *data;
==== //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/usr.sbin/usbconfig/Makefile 189585 2009-03-09 17:05:31Z thompsa $
+# $FreeBSD: src/usr.sbin/usbconfig/Makefile,v 1.2 2009/03/09 17:05:31 thompsa Exp $
#
PROG= usbconfig
MAN= usbconfig.8
==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/usr.sbin/usbconfig/dump.c 189110 2009-02-27 17:27:16Z thompsa $ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.4 2009/02/27 17:27:16 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#7 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/usr.sbin/usbconfig/dump.h 189110 2009-02-27 17:27:16Z thompsa $ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.h,v 1.3 2009/02/27 17:27:16 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#5 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: head/usr.sbin/usbconfig/usbconfig.8 184610 2008-11-04 02:31:03Z alfred $
+.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.2 2009/05/27 19:21:29 thompsa Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#15 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/usr.sbin/usbconfig/usbconfig.c 189110 2009-02-27 17:27:16Z thompsa $ */
+/* $FreeBSD: src/usr.sbin/usbconfig/usbconfig.c,v 1.8 2009/03/17 21:21:33 delphij Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -501,7 +501,6 @@
{
struct libusb20_backend *pbe;
struct options *opt = &options;
- char *cp;
int n;
int t;
More information about the p4-projects
mailing list