Undoing recent changes to make 3ware's i386 tools work on amd64, since there are
now amd64 versions of CLI and 3DM2 available.
This commit is contained in:
parent
8f118e25ec
commit
7a824c3756
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=142025
@ -500,25 +500,9 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
|
||||
struct twe_request *tr;
|
||||
u_int8_t srid;
|
||||
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;
|
||||
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 */
|
||||
case TWEIO_COMMAND:
|
||||
/* get a request */
|
||||
@ -604,16 +588,6 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
|
||||
splx(s);
|
||||
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:
|
||||
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",
|
||||
@ -631,16 +605,6 @@ twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr)
|
||||
}
|
||||
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:
|
||||
if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) {
|
||||
error = ENOMEM;
|
||||
|
@ -44,17 +44,6 @@ 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
|
||||
*/
|
||||
@ -100,18 +89,6 @@ struct twe_paramcommand {
|
||||
#define TWEIO_SET_PARAM _IOW ('T', 104, 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
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user