d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recognize the 32-bit form of the twe binary passthrough ioctl()s so that

Browse Source 
there is some hope for the 32-bit management utilities to run.  I've used
the cli successfully, but 3dm2 doesn't work for other reasons.  Of course,
a native binary of the 3dm2 and cli would be much better, but that doesn't
exist.
This commit is contained in:
Peter Wemm 2004-12-17 17:45:29 +00:00
parent 06c98c5dcc
commit d6ef0bf119
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/dev/twe/twe.c
View File

@ -500,9 +500,25 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
struct twe_request *tr; struct twe_request *tr;
u_int8_t srid; u_int8_t srid;
int s, error; int s, error;
#ifdef __amd64__
struct twe_paramcommand32 *tp32 = (struct twe_paramcommand32 *)addr;
struct twe_usercommand32 *tu32 = (struct twe_usercommand32 *)addr;
struct twe_paramcommand tp_swab;
struct twe_usercommand tu_swab;
#endif
error = 0; error = 0;
switch(ioctlcmd) { switch(ioctlcmd) {
#ifdef __amd64__
case TWEIO_COMMAND32:
tu_swab.tu_command = tu32->tu_command;
tu_swab.tu_data = (void *)(uintptr_t)tu32->tu_data;
tu_swab.tu_size = tu32->tu_size;
tu = &tu_swab;
/* FALLTHROUGH */
#endif
/* handle a command from userspace */ /* handle a command from userspace */
case TWEIO_COMMAND: case TWEIO_COMMAND:
/* get a request */ /* get a request */
@ -588,6 +604,16 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
splx(s); splx(s);
break; break;
#ifdef __amd64__
case TWEIO_GET_PARAM32:
tp_swab.tp_table_id = tp32->tp_table_id;
tp_swab.tp_param_id = tp32->tp_param_id;
tp_swab.tp_data = (void *)(uintptr_t)tp32->tp_data;
tp_swab.tp_size = tp32->tp_size;
tp = &tp_swab;
/* FALLTHROUGH */
#endif
case TWEIO_GET_PARAM: case TWEIO_GET_PARAM:
if ((param = twe_get_param(sc, tp->tp_table_id, tp->tp_param_id, tp->tp_size, NULL)) == NULL) { if ((param = twe_get_param(sc, tp->tp_table_id, tp->tp_param_id, tp->tp_size, NULL)) == NULL) {
twe_printf(sc, "TWEIO_GET_PARAM failed for 0x%x/0x%x/%d\n", twe_printf(sc, "TWEIO_GET_PARAM failed for 0x%x/0x%x/%d\n",
@ -605,6 +631,16 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
} }
break; break;
#ifdef __amd64__
case TWEIO_SET_PARAM32:
tp_swab.tp_table_id = tp32->tp_table_id;
tp_swab.tp_param_id = tp32->tp_param_id;
tp_swab.tp_data = (void *)(uintptr_t)tp32->tp_data;
tp_swab.tp_size = tp32->tp_size;
tp = &tp_swab;
/* FALLTHROUGH */
#endif
case TWEIO_SET_PARAM: case TWEIO_SET_PARAM:
if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) { if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) {
error = ENOMEM; error = ENOMEM;

23
sys/dev/twe/tweio.h
View File

@ -44,6 +44,17 @@ struct twe_usercommand {
#define TWEIO_COMMAND _IOWR('T', 100, struct twe_usercommand) #define TWEIO_COMMAND _IOWR('T', 100, struct twe_usercommand)
#ifdef __amd64__
struct twe_usercommand32 {
TWE_Command tu_command; /* command ready for the controller */
uint32_t tu_data; /* pointer to data in userspace */
uint32_t tu_size; /* userspace data length */
};
#define TWEIO_COMMAND32 _IOWR('T', 100, struct twe_usercommand32)
#endif
/* /*
* Command queue statistics * Command queue statistics
*/ */
@ -89,6 +100,18 @@ struct twe_paramcommand {
#define TWEIO_SET_PARAM _IOW ('T', 104, struct twe_paramcommand) #define TWEIO_SET_PARAM _IOW ('T', 104, struct twe_paramcommand)
#define TWEIO_GET_PARAM _IOW ('T', 105, struct twe_paramcommand) #define TWEIO_GET_PARAM _IOW ('T', 105, struct twe_paramcommand)
#ifdef __amd64__
struct twe_paramcommand32 {
u_int16_t tp_table_id;
u_int8_t tp_param_id;
u_int32_t tp_data;
u_int8_t tp_size;
};
#define TWEIO_SET_PARAM32 _IOW ('T', 104, struct twe_paramcommand32)
#define TWEIO_GET_PARAM32 _IOW ('T', 105, struct twe_paramcommand32)
#endif
/* /*
* Request a controller soft-reset * Request a controller soft-reset
*/ */