2005-11-14 17:37:31

by Harald Welte

[permalink] [raw]
Subject: [PATCH] Make usbdevice_fs.h (again) useable from userspace

Make usbdevice_fs.h (again) useable from userspace

If we have CONFIG_COMPAT enabled, then userspace programs using
usbdevice_fs.h won't compile anymore.

Signed-off-by: Harald Welte <[email protected]>

---
commit 17c6b20f34d9d68918346af2a2eb6433b09af0e3
tree 397763d1e6776163d45d97702a54d352295940c2
parent b3d70298da3a00f29dd82cf16c1f13407ad2ac09
author Harald Welte <[email protected]> Mon, 14 Nov 2005 18:34:23 +0100
committer Harald Welte <[email protected]> Mon, 14 Nov 2005 18:34:23 +0100

include/linux/usbdevice_fs.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -123,6 +123,7 @@ struct usbdevfs_hub_portinfo {
char port [127]; /* e.g. port 3 connects to device 27 */
};

+#ifdef __KERNEL__
#ifdef CONFIG_COMPAT
#include <linux/compat.h>
struct usbdevfs_urb32 {
@@ -147,6 +148,7 @@ struct usbdevfs_ioctl32 {
compat_caddr_t data;
};
#endif
+#endif

#define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer)
#define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer)

--
- Harald Welte <[email protected]> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)


Attachments:
(No filename) (1.48 kB)
(No filename) (189.00 B)
Download all attachments

2005-11-14 17:45:40

by Arjan van de Ven

[permalink] [raw]
Subject: Re: [PATCH] Make usbdevice_fs.h (again) useable from userspace

On Mon, 2005-11-14 at 18:37 +0100, Harald Welte wrote:
> Make usbdevice_fs.h (again) useable from userspace
>
> If we have CONFIG_COMPAT enabled, then userspace programs using
> usbdevice_fs.h won't compile anymore.

how does the userspace application set CONFIG_COMPAT??


2005-11-14 19:24:41

by Harald Welte

[permalink] [raw]
Subject: Re: [PATCH] Make usbdevice_fs.h (again) useable from userspace

On Mon, Nov 14, 2005 at 06:45:27PM +0100, Arjan van de Ven wrote:
> On Mon, 2005-11-14 at 18:37 +0100, Harald Welte wrote:
> > Make usbdevice_fs.h (again) useable from userspace
> >
> > If we have CONFIG_COMPAT enabled, then userspace programs using
> > usbdevice_fs.h won't compile anymore.
>
> how does the userspace application set CONFIG_COMPAT??

duh. good question. Seems like the application was broken by somehow
including config.h, so we can safely ignore this. Sorry for the noise.

--
- Harald Welte <[email protected]> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)


Attachments:
(No filename) (803.00 B)
(No filename) (189.00 B)
Download all attachments