- Make the FreeBSD's USB library compile under Linux.
- Fix a compile warning where the return value of a call to a write() function was ignored. - Remove redundant include files from userland USB header files. - Add some now needed include files to various C-files.
This commit is contained in:
parent
2ec88e9d1b
commit
6619413096
@ -37,6 +37,19 @@ SRCS+= libusb10_io.c
|
|||||||
CFLAGS+= -DCOMPAT_32BIT
|
CFLAGS+= -DCOMPAT_32BIT
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# Cross platform support
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
# make LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
|
||||||
|
# make COMPAT_32BIT=YES LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
|
||||||
|
#
|
||||||
|
.if defined(LIBUSB_GLOBAL_INCLUDE_FILE)
|
||||||
|
CFLAGS+= -DLIBUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\"
|
||||||
|
CFLAGS+= -DUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\"
|
||||||
|
CFLAGS+= -I ../../sys
|
||||||
|
.endif
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
||||||
# LibUSB v1.0
|
# LibUSB v1.0
|
||||||
|
@ -27,8 +27,11 @@
|
|||||||
#ifndef __LIBUSB_H__
|
#ifndef __LIBUSB_H__
|
||||||
#define __LIBUSB_H__
|
#define __LIBUSB_H__
|
||||||
|
|
||||||
|
#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include <stdint.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -28,11 +28,16 @@
|
|||||||
* This file contains the emulation layer for LibUSB v0.1 from sourceforge.
|
* This file contains the emulation layer for LibUSB v0.1 from sourceforge.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "libusb20.h"
|
#include "libusb20.h"
|
||||||
#include "libusb20_desc.h"
|
#include "libusb20_desc.h"
|
||||||
|
@ -25,17 +25,23 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/fcntl.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
#include <sys/ioctl.h>
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
#include <sys/queue.h>
|
#else
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/fcntl.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#include <sys/endian.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define libusb_device_handle libusb20_device
|
#define libusb_device_handle libusb20_device
|
||||||
|
|
||||||
@ -1331,7 +1337,7 @@ libusb10_submit_transfer_sub(struct libusb20_device *pdev, uint8_t endpoint)
|
|||||||
|
|
||||||
/* make sure our event loop spins the done handler */
|
/* make sure our event loop spins the done handler */
|
||||||
dummy = 0;
|
dummy = 0;
|
||||||
write(dev->ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
|
err = write(dev->ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The following function must be called unlocked */
|
/* The following function must be called unlocked */
|
||||||
|
@ -27,7 +27,9 @@
|
|||||||
#ifndef __LIBUSB10_H__
|
#ifndef __LIBUSB10_H__
|
||||||
#define __LIBUSB10_H__
|
#define __LIBUSB10_H__
|
||||||
|
|
||||||
|
#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
#include <sys/queue.h>
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define GET_CONTEXT(ctx) (((ctx) == NULL) ? usbi_default_context : (ctx))
|
#define GET_CONTEXT(ctx) (((ctx) == NULL) ? usbi_default_context : (ctx))
|
||||||
#define UNEXPORTED __attribute__((__visibility__("hidden")))
|
#define UNEXPORTED __attribute__((__visibility__("hidden")))
|
||||||
|
@ -24,10 +24,15 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define libusb_device_handle libusb20_device
|
#define libusb_device_handle libusb20_device
|
||||||
|
|
||||||
|
@ -24,15 +24,20 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#include <sys/endian.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define libusb_device_handle libusb20_device
|
#define libusb_device_handle libusb20_device
|
||||||
|
|
||||||
|
@ -24,13 +24,17 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "libusb20.h"
|
#include "libusb20.h"
|
||||||
#include "libusb20_desc.h"
|
#include "libusb20_desc.h"
|
||||||
|
@ -29,13 +29,9 @@
|
|||||||
#ifndef _LIBUSB20_H_
|
#ifndef _LIBUSB20_H_
|
||||||
#define _LIBUSB20_H_
|
#define _LIBUSB20_H_
|
||||||
|
|
||||||
#include <sys/endian.h>
|
#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#endif
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -24,11 +24,15 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "libusb20.h"
|
#include "libusb20.h"
|
||||||
#include "libusb20_desc.h"
|
#include "libusb20_desc.h"
|
||||||
|
@ -45,6 +45,10 @@
|
|||||||
#ifndef _LIBUSB20_DESC_H_
|
#ifndef _LIBUSB20_DESC_H_
|
||||||
#define _LIBUSB20_DESC_H_
|
#define _LIBUSB20_DESC_H_
|
||||||
|
|
||||||
|
#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include <stdint.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
@ -24,24 +24,28 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/queue.h>
|
#ifdef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
#include <sys/types.h>
|
#include LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#else
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <time.h>
|
||||||
#include "libusb20.h"
|
#include <sys/queue.h>
|
||||||
#include "libusb20_desc.h"
|
#include <sys/types.h>
|
||||||
#include "libusb20_int.h"
|
#endif
|
||||||
|
|
||||||
#include <dev/usb/usb.h>
|
#include <dev/usb/usb.h>
|
||||||
#include <dev/usb/usbdi.h>
|
#include <dev/usb/usbdi.h>
|
||||||
#include <dev/usb/usb_ioctl.h>
|
#include <dev/usb/usb_ioctl.h>
|
||||||
|
|
||||||
|
#include "libusb20.h"
|
||||||
|
#include "libusb20_desc.h"
|
||||||
|
#include "libusb20_int.h"
|
||||||
|
|
||||||
static libusb20_init_backend_t ugen20_init_backend;
|
static libusb20_init_backend_t ugen20_init_backend;
|
||||||
static libusb20_open_device_t ugen20_open_device;
|
static libusb20_open_device_t ugen20_open_device;
|
||||||
static libusb20_close_device_t ugen20_close_device;
|
static libusb20_close_device_t ugen20_close_device;
|
||||||
|
69
lib/libusb/libusb_global_linux.h
Normal file
69
lib/libusb/libusb_global_linux.h
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
/* $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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _LIBUSB_GLOBAL_LINUX_H_
|
||||||
|
#define _LIBUSB_GLOBAL_LINUX_H_
|
||||||
|
|
||||||
|
#define _XOPEN_SOURCE
|
||||||
|
#define _BSD_SOURCE
|
||||||
|
#define _POSIX_SOURCE
|
||||||
|
#define _POSIX_C_SOURCE 200809
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <alloca.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/poll.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <dev/usb/usb_endian.h>
|
||||||
|
#include <dev/usb/usb_freebsd.h>
|
||||||
|
|
||||||
|
#ifndef __aligned
|
||||||
|
#define __aligned(x) __attribute__((__aligned__(x)))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef __packed
|
||||||
|
#define __packed __attribute__((__packed__))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef strlcpy
|
||||||
|
#define strlcpy(d,s,len) do { \
|
||||||
|
strncpy(d,s,len); \
|
||||||
|
((char *)d)[(len) - 1] = 0; \
|
||||||
|
} while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _LIBUSB_GLOBAL_LINUX_H_ */
|
@ -27,10 +27,11 @@
|
|||||||
#ifndef _LIBUSB20_COMPAT_01_H_
|
#ifndef _LIBUSB20_COMPAT_01_H_
|
||||||
#define _LIBUSB20_COMPAT_01_H_
|
#define _LIBUSB20_COMPAT_01_H_
|
||||||
|
|
||||||
|
#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
|
||||||
|
#include <stdint.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/endian.h>
|
#include <sys/endian.h>
|
||||||
|
#endif
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
/* USB interface class codes */
|
/* USB interface class codes */
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <libusb20_desc.h>
|
#include <libusb20_desc.h>
|
||||||
#include <libusb20.h>
|
#include <libusb20.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user