Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: usbip: userspace: libsrc: remove usbip.h

Browse Source 
Remove the library version of usbip.h because its sole purpose was to
include other headers, which is bad practice. Also modify include
guards for consistency.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
matt mooney 2011-06-19 22:44:37 -07:00 committed by Greg Kroah-Hartman
parent c93be5b178
commit 099f79fa5a
8 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/usbip/userspace/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS := libsrc src SUBDIRS := libsrc src
includedir := @includedir@/usbip includedir := @includedir@/usbip
include_HEADERS := $(addprefix libsrc/, \ include_HEADERS := $(addprefix libsrc/, \
usbip.h usbip_common.h vhci_driver.h stub_driver.h) usbip_common.h vhci_driver.h stub_driver.h)
dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8) dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)

2
drivers/staging/usbip/userspace/libsrc/Makefile.am
View File

@ -3,5 +3,5 @@ libusbip_la_CFLAGS := @EXTRA_CFLAGS@
libusbip_la_LDFLAGS := -version-info @LIBUSBIP_VERSION@ libusbip_la_LDFLAGS := -version-info @LIBUSBIP_VERSION@
lib_LTLIBRARIES := libusbip.la lib_LTLIBRARIES := libusbip.la
libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h usbip.h \ libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h \
usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h

3
drivers/staging/usbip/userspace/libsrc/stub_driver.c
View File

@ -8,7 +8,8 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include "usbip.h" #include "usbip_common.h"
#include "stub_driver.h"
#undef PROGNAME #undef PROGNAME
#define PROGNAME "libusbip" #define PROGNAME "libusbip"

11
drivers/staging/usbip/userspace/libsrc/stub_driver.h
View File

@ -2,11 +2,11 @@
* Copyright (C) 2005-2007 Takahiro Hirofuchi * Copyright (C) 2005-2007 Takahiro Hirofuchi
*/ */
#ifndef _USBIP_STUB_DRIVER_H #ifndef __USBIP_STUB_DRIVER_H
#define _USBIP_STUB_DRIVER_H #define __USBIP_STUB_DRIVER_H
#include "usbip.h"
#include <stdint.h>
#include "usbip_common.h"
struct usbip_stub_driver { struct usbip_stub_driver {
int ndevs; int ndevs;
@ -33,4 +33,5 @@ int usbip_stub_refresh_device_list(void);
int usbip_stub_export_device(struct usbip_exported_device *edev, int sockfd); int usbip_stub_export_device(struct usbip_exported_device *edev, int sockfd);
struct usbip_exported_device *usbip_stub_get_device(int num); struct usbip_exported_device *usbip_stub_get_device(int num);
#endif
#endif /* __USBIP_STUB_DRIVER_H */

19
drivers/staging/usbip/userspace/libsrc/usbip.h
View File

@ -1,19 +0,0 @@
/*
* Copyright (C) 2005-2007 Takahiro Hirofuchi
*/
#ifndef _USBIP_H
#define _USBIP_H
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#include "usbip_common.h"
#include "stub_driver.h"
#include "vhci_driver.h"
#ifdef DMALLOC
#include <dmalloc.h>
#endif
#endif

2
drivers/staging/usbip/userspace/libsrc/usbip_common.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 2005-2007 Takahiro Hirofuchi * Copyright (C) 2005-2007 Takahiro Hirofuchi
*/ */
#include "usbip.h" #include "usbip_common.h"
#include "names.h" #include "names.h"
#undef PROGNAME #undef PROGNAME

4
drivers/staging/usbip/userspace/libsrc/vhci_driver.c
View File

@ -2,8 +2,8 @@
* Copyright (C) 2005-2007 Takahiro Hirofuchi * Copyright (C) 2005-2007 Takahiro Hirofuchi
*/ */
#include "usbip_common.h"
#include "usbip.h" #include "vhci_driver.h"
#undef PROGNAME #undef PROGNAME
#define PROGNAME "libusbip" #define PROGNAME "libusbip"

13
drivers/staging/usbip/userspace/libsrc/vhci_driver.h
View File

@ -2,13 +2,15 @@
* Copyright (C) 2005-2007 Takahiro Hirofuchi * Copyright (C) 2005-2007 Takahiro Hirofuchi
*/ */
#ifndef _VHCI_DRIVER_H #ifndef __VHCI_DRIVER_H
#define _VHCI_DRIVER_H #define __VHCI_DRIVER_H
#include "usbip.h" #include <sysfs/libsysfs.h>
#include <stdint.h>
#include "usbip_common.h"
#define USBIP_VHCI_BUS_TYPE "platform" #define USBIP_VHCI_BUS_TYPE "platform"
#define MAXNPORT 128 #define MAXNPORT 128
struct usbip_class_device { struct usbip_class_device {
@ -61,4 +63,5 @@ int usbip_vhci_attach_device(uint8_t port, int sockfd, uint8_t busnum,
uint8_t devnum, uint32_t speed); uint8_t devnum, uint32_t speed);
int usbip_vhci_detach_device(uint8_t port); int usbip_vhci_detach_device(uint8_t port);
#endif
#endif /* __VHCI_DRIVER_H */