diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Kbuild | 7 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| m--------- | deps/hid-tminit | 0 | ||||
| -rwxr-xr-x | dkms/dkms-install.sh | 2 | ||||
| -rw-r--r-- | dkms/dkms.conf | 13 | ||||
| -rw-r--r-- | docs/INTEGRATION.md | 5 | ||||
| -rw-r--r-- | src/tmt248/hid-tmt248.c | 9 | ||||
| -rw-r--r-- | src/tmtsxw/hid-tmtsxw.c | 9 | ||||
| -rw-r--r-- | src/tmtx/hid-tmtx.c | 9 |
10 files changed, 36 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules index 998e8c6..0e0f0fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "deps/hid-tminit"] path = deps/hid-tminit - url = https://github.com/scarburato/hid-tminit + url = https://github.com/Kimplul/hid-tminit.git @@ -1,2 +1,7 @@ obj-m := hid-tmff-new.o -hid-tmff-new-y := src/hid-tmff2.o src/tmt300rs/hid-tmt300rs.o src/tmt248/hid-tmt248.o src/tmtx/hid-tmtx.o src/tmtsxw/hid-tmtsxw.o +hid-tmff-new-y := \ + src/hid-tmff2.o \ + src/tmt300rs/hid-tmt300rs.o \ + src/tmt248/hid-tmt248.o \ + src/tmtx/hid-tmtx.o \ + src/tmtsxw/hid-tmtsxw.o @@ -1,4 +1,4 @@ -# Linux kernel module for Thrustmaster T300RS, T248 and (experimental) TX and TS-XW wheels +# Linux kernel module for Thrustmaster T300RS, T248 and (experimental) TX, T128 and TS-XW wheels > **DISCLAIMER:** The module is now ready for near-stable USE in most force > feedback games, supports rangesetting as well as gain and autocentering along @@ -113,7 +113,6 @@ for wheels: + [T500 RS](https://github.com/Kimplul/hid-tmff2/issues/18) + [T818](https://github.com/Kimplul/hid-tmff2/issues/58) + [T-GT II](https://github.com/Kimplul/hid-tmff2/issues/55) -+ [T128P](https://github.com/Kimplul/hid-tmff2/issues/67) (initial alpha support, needs `hid-tminit` tweaking) + [TS-PC](https://github.com/Kimplul/hid-tmff2/issues/65) ## Common issues and notes diff --git a/deps/hid-tminit b/deps/hid-tminit -Subproject 9375f6c7d83af5dd6c8b8fe30351d0f36043b20 +Subproject 17d6cad0b508417193ebf4d23f67c845487e993 diff --git a/dkms/dkms-install.sh b/dkms/dkms-install.sh index f677299..99a4c3b 100755 --- a/dkms/dkms-install.sh +++ b/dkms/dkms-install.sh @@ -9,7 +9,7 @@ if ! [ $(id -u) = 0 ]; then fi TM_NAME=hid-tmff2 -TM_VER=0.81 +TM_VER=0.82 DST="/usr/src/${TM_NAME}-${TM_VER}" mkdir -p "${DST}" diff --git a/dkms/dkms.conf b/dkms/dkms.conf index 3863d31..25a631e 100644 --- a/dkms/dkms.conf +++ b/dkms/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="hid-tmff2" -PACKAGE_VERSION="0.8" +PACKAGE_VERSION="0.82" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, @@ -11,8 +11,11 @@ CLEAN[0]="'make' KDIR=\"$kernel_source_dir\" clean" # The list of kernel modules. #__DKMS_MODULES -BUILT_MODULE_NAME[0]="hid-tminit" -BUILT_MODULE_LOCATION="deps/hid-tminit/" +BUILT_MODULE_LOCATION[0]="deps/hid-tminit/" +BUILT_MODULE_LOCATION[1]="deps/hid-tminit/" +BUILT_MODULE_NAME[0]="hid-tminit-new" +BUILT_MODULE_NAME[1]="usb-tminit-new" DEST_MODULE_LOCATION[0]="/kernel/drivers/hid" -BUILT_MODULE_NAME[1]="hid-tmff-new" -DEST_MODULE_LOCATION[1]="/kernel/drivers/hid" +DEST_MODULE_LOCATION[1]="/kernel/drivers/usb" +BUILT_MODULE_NAME[2]="hid-tmff-new" +DEST_MODULE_LOCATION[2]="/kernel/drivers/hid" diff --git a/docs/INTEGRATION.md b/docs/INTEGRATION.md index bcdb9f4..3d7c1aa 100644 --- a/docs/INTEGRATION.md +++ b/docs/INTEGRATION.md @@ -3,4 +3,7 @@ in the README. This page is intended to collect information about the topic. # NixOS -See https://github.com/Kimplul/hid-tmff2/issues/71. +The previous discussion was in https://github.com/Kimplul/hid-tmff2/issues/71, +but it seems to have been removed by GitHub. For now, please refer to + +https://search.nixos.org/packages?query=hid-tmff2 diff --git a/src/tmt248/hid-tmt248.c b/src/tmt248/hid-tmt248.c index af3aaa9..9ac43d9 100644 --- a/src/tmt248/hid-tmt248.c +++ b/src/tmt248/hid-tmt248.c @@ -163,7 +163,7 @@ err: return ret; } -int t248_wheel_destroy(void *data) +static int t248_wheel_destroy(void *data) { struct t300rs_device_entry *t300rs = data; @@ -175,7 +175,7 @@ int t248_wheel_destroy(void *data) return 0; } -int t248_set_range(void *data, uint16_t value) +static int t248_set_range(void *data, uint16_t value) { struct t300rs_device_entry *t248 = data; @@ -251,9 +251,10 @@ static int t248_close(void *data, int open_mode) return 0; } -int t248_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) +static int t248_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) { - struct t300rs_device_entry *t248 = kzalloc(sizeof(struct t300rs_device_entry), GFP_KERNEL); + struct t300rs_device_entry *t248 = kzalloc(sizeof(struct t300rs_device_entry), + GFP_KERNEL); struct list_head *report_list; int ret; diff --git a/src/tmtsxw/hid-tmtsxw.c b/src/tmtsxw/hid-tmtsxw.c index e281127..b8ee1fd 100644 --- a/src/tmtsxw/hid-tmtsxw.c +++ b/src/tmtsxw/hid-tmtsxw.c @@ -151,7 +151,7 @@ err: return ret; } -int tsxw_wheel_destroy(void *data) +static int tsxw_wheel_destroy(void *data) { struct t300rs_device_entry *t300rs = data; @@ -163,7 +163,7 @@ int tsxw_wheel_destroy(void *data) return 0; } -int tsxw_set_range(void *data, uint16_t value) +static int tsxw_set_range(void *data, uint16_t value) { struct t300rs_device_entry *tsxw = data; @@ -239,9 +239,10 @@ static int tsxw_close(void *data, int open_mode) return 0; } -int tsxw_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) +static int tsxw_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) { - struct t300rs_device_entry *tsxw = kzalloc(sizeof(struct t300rs_device_entry), GFP_KERNEL); + struct t300rs_device_entry *tsxw = kzalloc(sizeof(struct t300rs_device_entry), + GFP_KERNEL); struct list_head *report_list; int ret; diff --git a/src/tmtx/hid-tmtx.c b/src/tmtx/hid-tmtx.c index afca799..857886c 100644 --- a/src/tmtx/hid-tmtx.c +++ b/src/tmtx/hid-tmtx.c @@ -151,7 +151,7 @@ err: return ret; } -int tx_wheel_destroy(void *data) +static int tx_wheel_destroy(void *data) { struct t300rs_device_entry *t300rs = data; @@ -163,7 +163,7 @@ int tx_wheel_destroy(void *data) return 0; } -int tx_set_range(void *data, uint16_t value) +static int tx_set_range(void *data, uint16_t value) { struct t300rs_device_entry *tx = data; @@ -239,9 +239,10 @@ static int tx_close(void *data, int open_mode) return 0; } -int tx_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) +static int tx_wheel_init(struct tmff2_device_entry *tmff2, int open_mode) { - struct t300rs_device_entry *tx = kzalloc(sizeof(struct t300rs_device_entry), GFP_KERNEL); + struct t300rs_device_entry *tx = kzalloc(sizeof(struct t300rs_device_entry), + GFP_KERNEL); struct list_head *report_list; int ret; |