PERFORCE change 158999 for review
Andrew Thompson
thompsa at FreeBSD.org
Tue Mar 10 07:46:21 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=158999
Change 158999 by thompsa at thompsa_burger on 2009/03/10 14:46:00
IFC @158996
Affected files ...
.. //depot/projects/usb/src/lib/libusb20/Makefile#4 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20.3#8 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20.c#16 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20.h#11 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#4 delete
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 edit
.. //depot/projects/usb/src/lib/libusb20/usb.h#1 add
.. //depot/projects/usb/src/lib/libusbhid/Makefile#3 edit
.. //depot/projects/usb/src/lib/libusbhid/data.c#2 edit
.. //depot/projects/usb/src/lib/libusbhid/descr.c#6 edit
.. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#2 edit
.. //depot/projects/usb/src/lib/libusbhid/parse.c#2 edit
.. //depot/projects/usb/src/lib/libusbhid/usage.c#2 edit
.. //depot/projects/usb/src/lib/libusbhid/usbhid.3#5 edit
.. //depot/projects/usb/src/lib/libusbhid/usbhid.h#4 edit
.. //depot/projects/usb/src/lib/libusbhid/usbvar.h#3 edit
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#18 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#18 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/trap.c#12 integrate
.. //depot/projects/usb/src/sys/amd64/conf/NOTES#16 integrate
.. //depot/projects/usb/src/sys/arm/conf/AVILA#13 integrate
.. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#4 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate
.. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#7 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#6 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#7 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/main.c#8 integrate
.. //depot/projects/usb/src/sys/compat/ndis/hal_var.h#2 integrate
.. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#12 integrate
.. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#7 integrate
.. //depot/projects/usb/src/sys/compat/ndis/ndis_var.h#5 integrate
.. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#8 integrate
.. //depot/projects/usb/src/sys/compat/ndis/pe_var.h#2 integrate
.. //depot/projects/usb/src/sys/compat/ndis/resource_var.h#2 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#15 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_pe.c#3 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#8 integrate
.. //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#5 integrate
.. //depot/projects/usb/src/sys/conf/files#54 integrate
.. //depot/projects/usb/src/sys/ddb/db_expr.c#2 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#6 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#3 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#7 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_intel.c#2 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_via.c#3 integrate
.. //depot/projects/usb/src/sys/dev/agp/agppriv.h#3 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-cbus.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-isa.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#19 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#15 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#10 integrate
.. //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#4 integrate
.. //depot/projects/usb/src/sys/dev/cfi/cfi_dev.c#3 integrate
.. //depot/projects/usb/src/sys/dev/cfi/cfi_disk.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_var.h#3 integrate
.. //depot/projects/usb/src/sys/dev/dc/if_dc.c#10 integrate
.. //depot/projects/usb/src/sys/dev/drm/drmP.h#10 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#9 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#6 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/mga_drv.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#1 branch
.. //depot/projects/usb/src/sys/dev/drm/r600_microcode.h#1 branch
.. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#6 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drm.h#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#6 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/savage_drv.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/sis_drv.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/tdfx_drv.c#4 integrate
.. //depot/projects/usb/src/sys/dev/exca/exca.c#6 integrate
.. //depot/projects/usb/src/sys/dev/firewire/fwohci_pci.c#7 integrate
.. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#9 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#19 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#14 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate
.. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#8 integrate
.. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#4 integrate
.. //depot/projects/usb/src/sys/dev/mii/ip1000phyreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#18 integrate
.. //depot/projects/usb/src/sys/dev/puc/puc_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ral/if_ral_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/re/if_re.c#16 integrate
.. //depot/projects/usb/src/sys/dev/sio/sio_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/smbus/smbus.c#3 integrate
.. //depot/projects/usb/src/sys/dev/smbus/smbus.h#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/emu10k1.c#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#9 integrate
.. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#11 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.h#7 integrate
.. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#5 integrate
.. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#5 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#4 integrate
.. //depot/projects/usb/src/sys/dev/vge/if_vge.c#7 integrate
.. //depot/projects/usb/src/sys/dev/xl/if_xl.c#2 integrate
.. //depot/projects/usb/src/sys/geom/geom_redboot.c#1 branch
.. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#8 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate
.. //depot/projects/usb/src/sys/i386/conf/NOTES#19 integrate
.. //depot/projects/usb/src/sys/i386/i386/in_cksum.c#3 integrate
.. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#16 integrate
.. //depot/projects/usb/src/sys/i386/i386/trap.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_prot.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_tc.c#5 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#18 integrate
.. //depot/projects/usb/src/sys/kern/subr_param.c#8 integrate
.. //depot/projects/usb/src/sys/kern/subr_witness.c#18 integrate
.. //depot/projects/usb/src/sys/kern/sys_pipe.c#10 integrate
.. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#13 integrate
.. //depot/projects/usb/src/sys/kern/vfs_bio.c#14 integrate
.. //depot/projects/usb/src/sys/kern/vfs_cache.c#18 integrate
.. //depot/projects/usb/src/sys/kern/vfs_default.c#9 integrate
.. //depot/projects/usb/src/sys/kern/vfs_extattr.c#5 integrate
.. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/usb/src/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/if_ndis/Makefile#6 integrate
.. //depot/projects/usb/src/sys/modules/ndis/Makefile#7 integrate
.. //depot/projects/usb/src/sys/net/bpf.c#15 integrate
.. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/igmp_var.h#3 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/in.h#10 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#15 integrate
.. //depot/projects/usb/src/sys/netinet/in_proto.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/in_var.h#10 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/ip_var.h#8 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#7 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_gif.c#11 integrate
.. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#4 integrate
.. //depot/projects/usb/src/sys/security/audit/audit.c#12 integrate
.. //depot/projects/usb/src/sys/security/audit/audit.h#10 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_audit.c#5 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_cred.c#2 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_framework.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_framework.h#9 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_inet.c#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_internal.h#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_policy.h#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#3 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_priv.c#3 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_process.c#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_socket.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_system.c#5 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#6 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#11 integrate
.. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate
.. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate
.. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac_stub/mac_stub.c#11 integrate
.. //depot/projects/usb/src/sys/security/mac_test/mac_test.c#11 integrate
.. //depot/projects/usb/src/sys/sys/buf.h#5 integrate
.. //depot/projects/usb/src/sys/sys/param.h#24 integrate
.. //depot/projects/usb/src/sys/sys/pipe.h#3 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#16 integrate
.. //depot/projects/usb/src/sys/sys/sysctl.h#15 integrate
.. //depot/projects/usb/src/sys/sys/vimage.h#6 integrate
.. //depot/projects/usb/src/sys/sys/vnode.h#17 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate
.. //depot/projects/usb/src/sys/vm/vm_init.c#4 integrate
.. //depot/projects/usb/src/sys/vm/vnode_pager.c#13 integrate
.. //depot/projects/usb/src/usr.bin/usbhidaction/usbhidaction.c#2 edit
.. //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#2 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#4 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#11 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#6 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#3 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#14 edit
Differences ...
==== //depot/projects/usb/src/lib/libusb20/Makefile#4 (text+ko) ====
@@ -1,10 +1,10 @@
#
-# $FreeBSD: src/lib/libusb20/Makefile,v 1.1 2008/11/04 02:31:03 alfred Exp $
+# $FreeBSD: head/lib/libusb/Makefile 189587 2009-03-09 17:09:46Z thompsa $
#
# Makefile for the FreeBSD specific LibUSB 2.0
#
-LIB= usb20
+LIB= usb
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
SRCS= libusb20.c
@@ -14,11 +14,12 @@
SRCS+= libusb20_compat10.c
INCS+= libusb20.h
INCS+= libusb20_desc.h
-INCS+= libusb20_compat01.h
-INCS+= libusb20_compat10.h
MAN= libusb20.3
MKLINT= no
NOGCCERROR=
+# libusb 0.1 compat
+INCS+= usb.h
+
.include <bsd.lib.mk>
==== //depot/projects/usb/src/lib/libusb20/libusb20.3#8 (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/libusb20/libusb20.3,v 1.1 2008/11/04 02:31:03 alfred Exp $
+.\" $FreeBSD: head/lib/libusb/libusb20.3 189587 2009-03-09 17:09:46Z thompsa $
.\"
.Dd Feb 14, 2009
.Dt LIBUSB20 3
@@ -514,72 +514,6 @@
.
.Pp
.
-.Fn libusb20_dev_set_owner pdev uid gid
-This function will set the ownership of the given USB device.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_set_perm pdev mode
-This function will set the permissions of the given USB device.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_set_iface_owner pdev iface_index uid gid
-This function will set the ownership of the given USB interface.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_set_iface_perm pdev iface_index mode
-This function will set the permissions of the given USB interface.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_get_owner pdev puid pgid
-This function will retrieve the current USB device ownership.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_get_perm pdev pmode
-This function will retrieve the current USB device permissions.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_get_iface_owner pdev iface_index puid pgid
-This function will retrieve the current USB interface ownership for
-the given USB interface.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_dev_get_iface_perm pdev iface_index pmode
-This function will retrieve the current USB interface permissions for
-the given USB interface.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
.Fn libusb20_dev_get_device_desc pdev
This function returns a pointer to the decoded and host endian version
of the device descriptor.
@@ -663,39 +597,6 @@
.Xr 2 poll
function.
.
-.Sh USB BUS OPERATIONS
-.
-.Fn libusb20_bus_set_owner pbackend bus_index uid gid
-This function will set the ownership for the given USB bus.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_bus_set_perm pbackend bus_index mode
-This function will set the permissions for the given USB bus.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_bus_get_owner pbackend bus_index puid pgid
-This function will retrieve the ownership for the given USB bus.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_bus_get_perm pbackend bus_index pmode
-This function will retrieve the permissions for the given USB bus.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.
.Sh USB BACKEND OPERATIONS
.
.Fn libusb20_be_get_template pbackend ptemp
@@ -772,47 +673,6 @@
If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is
returned.
.
-.Pp
-.
-.Fn libusb20_be_set_owner pbackend uid gid
-This function will set the ownership for the given backend.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_be_set_perm pbackend mode
-This function will set the permissions for the given backend.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_be_get_owner pbackend puid pgid
-This function will retrieve the ownership of the given backend.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_be_get_perm pbackend pmode
-This function will retrieve the permissions of the given backend.
-.
-.
-This function returns zero on success else a LIBUSB20_ERROR value is
-returned.
-.
-.Pp
-.
-.Fn libusb20_be_alloc pmethods
-This is an internal function to allocate a USB backend.
-.
-.Pp
-.Fn libusb20_be_alloc_default void
-.Fn libusb20_be_alloc_freebsd void
.Fn libusb20_be_alloc_linux void
These functions are used to allocate a specific USB backend or the
operating system default USB backend. Allocating a backend is a way to
==== //depot/projects/usb/src/lib/libusb20/libusb20.c#16 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20.c 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -971,86 +971,6 @@
}
int
-libusb20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group)
-{
- return (pdev->beMethods->dev_set_owner(pdev, user, group));
-}
-
-int
-libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode)
-{
- return (pdev->beMethods->dev_set_perm(pdev, mode));
-}
-
-int
-libusb20_dev_set_iface_owner(struct libusb20_device *pdev,
- uint8_t iface_index, uid_t user, gid_t group)
-{
- return (pdev->beMethods->dev_set_iface_owner(
- pdev, iface_index, user, group));
-}
-
-int
-libusb20_dev_set_iface_perm(struct libusb20_device *pdev,
- uint8_t iface_index, mode_t mode)
-{
- return (pdev->beMethods->dev_set_iface_perm(
- pdev, iface_index, mode));
-}
-
-int
-libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group)
-{
- uid_t a;
- gid_t b;
-
- if (user == NULL)
- user = &a;
- if (group == NULL)
- group = &b;
-
- return (pdev->beMethods->dev_get_owner(pdev, user, group));
-}
-
-int
-libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode)
-{
- mode_t a;
-
- if (mode == NULL)
- mode = &a;
- return (pdev->beMethods->dev_get_perm(pdev, mode));
-}
-
-int
-libusb20_dev_get_iface_owner(struct libusb20_device *pdev,
- uint8_t iface_index, uid_t *user, gid_t *group)
-{
- uid_t a;
- gid_t b;
-
- if (user == NULL)
- user = &a;
- if (group == NULL)
- group = &b;
-
- return (pdev->beMethods->dev_get_iface_owner(
- pdev, iface_index, user, group));
-}
-
-int
-libusb20_dev_get_iface_perm(struct libusb20_device *pdev,
- uint8_t iface_index, mode_t *mode)
-{
- mode_t a;
-
- if (mode == NULL)
- mode = &a;
- return (pdev->beMethods->dev_get_iface_perm(
- pdev, iface_index, mode));
-}
-
-int
libusb20_dev_get_iface_desc(struct libusb20_device *pdev,
uint8_t iface_index, char *buf, uint8_t len)
{
@@ -1061,45 +981,6 @@
pdev, iface_index, buf, len));
}
-/* USB bus operations */
-
-int
-libusb20_bus_set_owner(struct libusb20_backend *pbe,
- uint8_t bus, uid_t user, gid_t group)
-{
- return (pbe->methods->bus_set_owner(pbe, bus, user, group));
-}
-
-int
-libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode)
-{
- return (pbe->methods->bus_set_perm(pbe, bus, mode));
-}
-
-int
-libusb20_bus_get_owner(struct libusb20_backend *pbe,
- uint8_t bus, uid_t *user, gid_t *group)
-{
- uid_t a;
- gid_t b;
-
- if (user == NULL)
- user = &a;
- if (group == NULL)
- group = &b;
- return (pbe->methods->bus_get_owner(pbe, bus, user, group));
-}
-
-int
-libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode)
-{
- mode_t a;
-
- if (mode == NULL)
- mode = &a;
- return (pbe->methods->bus_get_perm(pbe, bus, mode));
-}
-
/* USB backend operations */
int
@@ -1131,41 +1012,6 @@
}
int
-libusb20_be_set_owner(struct libusb20_backend *pbe, uid_t user, gid_t group)
-{
- return (pbe->methods->root_set_owner(pbe, user, group));
-}
-
-int
-libusb20_be_set_perm(struct libusb20_backend *pbe, mode_t mode)
-{
- return (pbe->methods->root_set_perm(pbe, mode));
-}
-
-int
-libusb20_be_get_owner(struct libusb20_backend *pbe, uid_t *user, gid_t *group)
-{
- uid_t a;
- gid_t b;
-
- if (user == NULL)
- user = &a;
- if (group == NULL)
- group = &b;
- return (pbe->methods->root_get_owner(pbe, user, group));
-}
-
-int
-libusb20_be_get_perm(struct libusb20_backend *pbe, mode_t *mode)
-{
- mode_t a;
-
- if (mode == NULL)
- mode = &a;
- return (pbe->methods->root_get_perm(pbe, mode));
-}
-
-int
libusb20_be_set_template(struct libusb20_backend *pbe, int temp)
{
return (pbe->methods->root_set_template(pbe, temp));
==== //depot/projects/usb/src/lib/libusb20/libusb20.h#11 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20.h 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
@@ -253,14 +253,6 @@
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_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group);
-int libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode);
-int libusb20_dev_set_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group);
-int libusb20_dev_set_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode);
-int libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group);
-int libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode);
-int libusb20_dev_get_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group);
-int libusb20_dev_get_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode);
int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
@@ -276,23 +268,12 @@
void libusb20_dev_set_debug(struct libusb20_device *pdev, int debug);
void libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout);
-/* USB bus operations */
-
-int libusb20_bus_set_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group);
-int libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode);
-int libusb20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group);
-int libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode);
-
/* USB global operations */
int libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq);
int libusb20_be_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq);
int libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
int libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
-int libusb20_be_set_owner(struct libusb20_backend *be, uid_t user, gid_t group);
-int libusb20_be_set_perm(struct libusb20_backend *be, mode_t mode);
-int libusb20_be_get_owner(struct libusb20_backend *be, uid_t *user, gid_t *group);
-int libusb20_be_get_perm(struct libusb20_backend *be, mode_t *mode);
/* USB backend operations */
==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_compat01.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_compat01.c 189621 2009-03-10 14:29:34Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -37,7 +37,7 @@
#include "libusb20.h"
#include "libusb20_desc.h"
#include "libusb20_int.h"
-#include "libusb20_compat01.h"
+#include "usb.h"
/*
* The two following macros were taken from the original LibUSB v0.1
==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_compat10.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_compat10.c 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_compat10.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_compat10.h 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_desc.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_desc.c 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_desc.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_desc.h 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_int.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_int.h 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -48,27 +48,11 @@
typedef int (libusb20_root_get_quirk_name_t)(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq);
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_bus_get_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group);
-typedef int (libusb20_bus_get_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode);
-typedef int (libusb20_bus_set_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group);
-typedef int (libusb20_bus_set_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t mode);
typedef int (libusb20_close_device_t)(struct libusb20_device *pdev);
-typedef int (libusb20_dev_get_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group);
-typedef int (libusb20_dev_get_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode);
-typedef int (libusb20_dev_get_owner_t)(struct libusb20_device *pdev, uid_t *user, gid_t *group);
-typedef int (libusb20_dev_get_perm_t)(struct libusb20_device *pdev, mode_t *mode);
typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_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_dev_set_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group);
-typedef int (libusb20_dev_set_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode);
-typedef int (libusb20_dev_set_owner_t)(struct libusb20_device *pdev, uid_t user, gid_t group);
-typedef int (libusb20_dev_set_perm_t)(struct libusb20_device *pdev, mode_t mode);
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);
-typedef int (libusb20_root_get_owner_t)(struct libusb20_backend *pbe, uid_t *user, gid_t *group);
-typedef int (libusb20_root_get_perm_t)(struct libusb20_backend *pbe, mode_t *mode);
-typedef int (libusb20_root_set_owner_t)(struct libusb20_backend *pbe, uid_t user, gid_t group);
-typedef int (libusb20_root_set_perm_t)(struct libusb20_backend *pbe, mode_t mode);
typedef void (libusb20_exit_backend_t)(struct libusb20_backend *pbe);
typedef int (libusb20_root_set_template_t)(struct libusb20_backend *pbe, int temp);
typedef int (libusb20_root_get_template_t)(struct libusb20_backend *pbe, int *ptemp);
@@ -85,28 +69,12 @@
/* optional backend methods */ \
m(n, init_backend) \
m(n, exit_backend) \
- m(n, bus_set_owner) \
- m(n, bus_get_owner) \
- m(n, bus_set_perm) \
- m(n, bus_get_perm) \
m(n, dev_get_info) \
- m(n, dev_get_iface_owner) \
- m(n, dev_get_iface_perm) \
m(n, dev_get_iface_desc) \
- m(n, dev_get_owner) \
- m(n, dev_get_perm) \
- m(n, dev_set_iface_owner) \
- m(n, dev_set_iface_perm) \
- m(n, dev_set_owner) \
- m(n, dev_set_perm) \
m(n, root_get_dev_quirk) \
m(n, root_get_quirk_name) \
m(n, root_add_dev_quirk) \
m(n, root_remove_dev_quirk) \
- m(n, root_set_owner) \
- m(n, root_get_owner) \
- m(n, root_set_perm) \
- m(n, root_get_perm) \
m(n, root_set_template) \
m(n, root_get_template) \
/* mandatory device methods */ \
==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb20/libusb20_ugen20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
+/* $FreeBSD: head/lib/libusb/libusb20_ugen20.c 189587 2009-03-09 17:09:46Z thompsa $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -39,39 +39,23 @@
#include "libusb20_desc.h"
#include "libusb20_int.h"
-#include <dev/usb2/include/usb2_standard.h>
-#include <dev/usb2/include/usb2_ioctl.h>
-#include <dev/usb2/include/usb2_mfunc.h>
-#include <dev/usb2/include/usb2_error.h>
-#include <dev/usb2/include/usb2_revision.h>
+#include <dev/usb/usb.h>
+#include <dev/usb/usb_ioctl.h>
+#include <dev/usb/usb_mfunc.h>
+#include <dev/usb/usb_error.h>
+#include <dev/usb/usb_revision.h>
static libusb20_init_backend_t ugen20_init_backend;
static libusb20_open_device_t ugen20_open_device;
static libusb20_close_device_t ugen20_close_device;
static libusb20_get_backend_name_t ugen20_get_backend_name;
static libusb20_exit_backend_t ugen20_exit_backend;
-static libusb20_bus_set_owner_t ugen20_bus_set_owner;
-static libusb20_bus_get_owner_t ugen20_bus_get_owner;
-static libusb20_bus_set_perm_t ugen20_bus_set_perm;
-static libusb20_bus_get_perm_t ugen20_bus_get_perm;
-static libusb20_dev_get_iface_owner_t ugen20_dev_get_iface_owner;
-static libusb20_dev_get_iface_perm_t ugen20_dev_get_iface_perm;
-static libusb20_dev_get_owner_t ugen20_dev_get_owner;
-static libusb20_dev_get_perm_t ugen20_dev_get_perm;
static libusb20_dev_get_iface_desc_t ugen20_dev_get_iface_desc;
static libusb20_dev_get_info_t ugen20_dev_get_info;
-static libusb20_dev_set_iface_owner_t ugen20_dev_set_iface_owner;
-static libusb20_dev_set_iface_perm_t ugen20_dev_set_iface_perm;
-static libusb20_dev_set_owner_t ugen20_dev_set_owner;
-static libusb20_dev_set_perm_t ugen20_dev_set_perm;
static libusb20_root_get_dev_quirk_t ugen20_root_get_dev_quirk;
static libusb20_root_get_quirk_name_t ugen20_root_get_quirk_name;
static libusb20_root_add_dev_quirk_t ugen20_root_add_dev_quirk;
static libusb20_root_remove_dev_quirk_t ugen20_root_remove_dev_quirk;
-static libusb20_root_set_owner_t ugen20_root_set_owner;
-static libusb20_root_get_owner_t ugen20_root_get_owner;
-static libusb20_root_set_perm_t ugen20_root_set_perm;
-static libusb20_root_get_perm_t ugen20_root_get_perm;
static libusb20_root_set_template_t ugen20_root_set_template;
static libusb20_root_get_template_t ugen20_root_get_template;
@@ -152,7 +136,7 @@
pdev->bus_number = ugen20_path_convert_one(&tmp);
pdev->device_address = ugen20_path_convert_one(&tmp);
- snprintf(buf, sizeof(buf), "/dev/ugen%u.%u",
+ snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u",
pdev->bus_number, pdev->device_address);
f = open(buf, O_RDWR);
@@ -218,7 +202,7 @@
/* generate a nice description for printout */
snprintf(pdev->usb_desc, sizeof(pdev->usb_desc),
- "ugen%u.%u: <%s %s> at usbus%u", pdev->bus_number,
+ USB_GENERIC_NAME "%u.%u: <%s %s> at usbus%u", pdev->bus_number,
pdev->device_address, devinfo.udi_product,
devinfo.udi_vendor, pdev->bus_number);
@@ -284,7 +268,7 @@
memset(&state, 0, sizeof(state));
- state.f = open("/dev/usb", O_RDONLY);
+ state.f = open("/dev/" USB_DEVICE_NAME, O_RDONLY);
if (state.f < 0)
return (LIBUSB20_ERROR_OTHER);
@@ -379,7 +363,7 @@
int g;
int error;
- snprintf(buf, sizeof(buf), "/dev/ugen%u.%u",
+ snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u",
pdev->bus_number, pdev->device_address);
/*
@@ -873,7 +857,7 @@
int f;
int error;
- f = open("/dev/usb", O_RDONLY);
+ f = open("/dev/" USB_DEVICE_NAME, O_RDONLY);
if (f < 0)
return (LIBUSB20_ERROR_OTHER);
error = ioctl(f, cmd, data);
@@ -889,75 +873,6 @@
}
static int
-ugen20_be_do_perm(uint32_t get_cmd, uint32_t set_cmd, uint8_t bus,
- uint8_t dev, uint8_t iface, uid_t *uid,
- gid_t *gid, mode_t *mode)
-{
- struct usb2_dev_perm perm;
- int error;
-
- memset(&perm, 0, sizeof(perm));
-
- perm.bus_index = bus;
- perm.dev_index = dev;
- perm.iface_index = iface;
-
- error = ugen20_be_ioctl(get_cmd, &perm);
- if (error)
- return (error);
-
- if (set_cmd == 0) {
- if (uid)
- *uid = perm.user_id;
- if (gid)
- *gid = perm.group_id;
- if (mode)
- *mode = perm.mode;
- return (0);
- }
- if (uid)
- perm.user_id = *uid;
- if (gid)
- perm.group_id = *gid;
- if (mode)
- perm.mode = *mode;
-
- return (ugen20_be_ioctl(set_cmd, &perm));
-}
-
-static int
-ugen20_bus_set_owner(struct libusb20_backend *pbe,
- uint8_t bus, uid_t user, gid_t group)
-{
- return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM,
- bus, 0, 0, &user, &group, NULL));
-}
-
-static int
-ugen20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus,
- uid_t *user, gid_t *group)
-{
- return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0,
- bus, 0, 0, user, group, NULL));
-}
-
-static int
-ugen20_bus_set_perm(struct libusb20_backend *pbe,
- uint8_t bus, mode_t mode)
-{
- return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM,
- bus, 0, 0, NULL, NULL, &mode));
-}
-
-static int
-ugen20_bus_get_perm(struct libusb20_backend *pbe,
- uint8_t bus, mode_t *mode)
-{
- return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0,
- bus, 0, 0, NULL, NULL, mode));
-}
-
-static int
ugen20_dev_get_iface_desc(struct libusb20_device *pdev,
uint8_t iface_index, char *buf, uint8_t len)
{
@@ -986,59 +901,6 @@
}
static int
-ugen20_dev_get_iface_owner(struct libusb20_device *pdev,
- uint8_t iface_index, uid_t *user, gid_t *group)
-{
- return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0,
- pdev->bus_number, pdev->device_address, iface_index,
- user, group, NULL));
-}
-
-static int
-ugen20_dev_get_iface_perm(struct libusb20_device *pdev,
- uint8_t iface_index, mode_t *mode)
-{
- return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0,
- pdev->bus_number, pdev->device_address, iface_index,
- NULL, NULL, mode));
-}
-
-static int
-ugen20_dev_get_owner(struct libusb20_device *pdev,
- uid_t *user, gid_t *group)
-{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list