Merge branch 't248'

1 files changed, 6 insertions, 155 deletions

diff --git a/hid-tmt300rs.h b/hid-tmt300rs.h
index 496ba8f..9357ce1 100644
--- a/hid-tmt300rs.h
+++ b/hid-tmt300rs.h
@@ -1,158 +1,9 @@
-/* SPDX-License-Identifier: GLP-2.0 */
-#include <linux/hid.h>
-#include <linux/usb.h>
-#include <linux/input.h>
-#include <linux/module.h>
-#include <linux/hrtimer.h>
-#include <linux/slab.h>
-#include <linux/ktime.h>
-#include <linux/fixp-arith.h>
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __HID_TMT300RS_H
+#define __HID_TMT300RS_H
 
-//#include "hid-ids.h"
+#include "hid-tmff2.h"
 
-#define USB_VENDOR_ID_THRUSTMASTER 0x044f
+int t300rs_populate_api(struct tmff2_device_entry *tmff2);
 
-#define T300RS_MAX_EFFECTS 16
-#define T300RS_BUFFER_LENGTH 63
-
-/* the wheel seems to only be capable of processing a certain number of
- * interrupts per second, and if this value is too low the kernel urb buffer(or
- * some buffer at least) fills up. Optimally I would figure out some way to
- * space out the interrupts so that they all leave at regular intervals, but
- * for now this is good enough, go slow enough that everything works.
- */
-#define DEFAULT_TIMER_PERIOD 8
-
-#define FF_EFFECT_QUEUE_UPLOAD 0
-#define FF_EFFECT_QUEUE_START 1
-#define FF_EFFECT_QUEUE_STOP 2
-#define FF_EFFECT_PLAYING 3
-#define FF_EFFECT_QUEUE_UPDATE 4
-
-#define CLAMP_VALUE_U16(x) ((unsigned short)((x) > 0xffff ? 0xffff : (x)))
-#define SCALE_VALUE_U16(x, bits) (CLAMP_VALUE_U16(x) >> (16 - bits))
-#define JIFFIES2MS(jiffies) ((jiffies) * 1000 / HZ)
-
-spinlock_t lock;
-unsigned long lock_flags;
-
-spinlock_t data_lock;
-unsigned long data_flags;
-
-static const signed short t300rs_ff_effects[] = {
-		FF_CONSTANT,
-		FF_RAMP,
-		FF_SPRING,
-		FF_DAMPER,
-		FF_FRICTION,
-		FF_INERTIA,
-		FF_PERIODIC,
-		FF_SINE,
-		FF_TRIANGLE,
-		FF_SQUARE,
-		FF_SAW_UP,
-		FF_SAW_DOWN,
-		FF_AUTOCENTER,
-		FF_GAIN,
-		-1
-};
-
-struct t300rs_effect_state {
-		struct ff_effect effect;
-		struct ff_effect old;
-		bool old_set;
-		unsigned long flags;
-		unsigned long start_time;
-		unsigned long count;
-};
-
-struct __packed t300rs_firmware_response {
-		uint8_t unknown0;
-		uint8_t unknown1;
-		uint8_t firmware_version;
-		uint8_t	unknown2;
-};
-
-
-struct usb_ctrlrequest t300rs_firmware_request = {
-		.bRequestType = 0xc1,
-		.bRequest = 86,
-		.wValue = 0,
-		.wIndex = 0,
-		.wLength = 8
-};
-
-
-struct t300rs_device_entry {
-		struct hid_device *hdev;
-		struct input_dev *input_dev;
-		struct hid_report *report;
-		struct hid_field *ff_field;
-		struct usb_device *usbdev;
-		struct usb_interface *usbif;
-		struct t300rs_effect_state *states;
-		struct t300rs_firmware_response *firmware_response;
-		struct hrtimer hrtimer;
-
-		int (*open)(struct input_dev *dev);
-		void (*close)(struct input_dev *dev);
-
-		spinlock_t lock;
-		unsigned long lock_flags;
-
-		u8 *send_buffer;
-
-		u16 range;
-		u8 effects_used;
-};
-
-
-struct t300rs_data {
-		unsigned long quirks;
-		void *device_props;
-};
-
-static __u8 t300rs_rdesc_fixed[] = {
-		0x05, 0x01, 0x09, 0x04, 0xa1,
-		0x01, 0x09, 0x01, 0xa1, 0x00,
-		0x85, 0x07, 0x09, 0x30, 0x15,
-		0x00, 0x27, 0xff, 0xff, 0x00,
-		0x00, 0x35, 0x00, 0x47, 0xff,
-		0xff, 0x00, 0x00, 0x75, 0x10,
-		0x95, 0x01, 0x81, 0x02, 0x09,
-		0x35, 0x26, 0xff, 0x03, 0x46,
-		0xff, 0x03, 0x81, 0x02, 0x09,
-		0x32, 0x81, 0x02, 0x09, 0x31,
-		0x81, 0x02, 0x81, 0x03, 0x05,
-		0x09, 0x19, 0x01, 0x29, 0x0d,
-		0x25, 0x01, 0x45, 0x01, 0x75,
-		0x01, 0x95, 0x0d, 0x81, 0x02,
-		0x75, 0x0b, 0x95, 0x01, 0x81,
-		0x03, 0x05, 0x01, 0x09, 0x39,
-		0x25, 0x07, 0x46, 0x3b, 0x01,
-		0x55, 0x00, 0x65, 0x14, 0x75,
-		0x04, 0x81, 0x42, 0x65, 0x00,
-		0x81, 0x03, 0x85, 0x60, // here 0x0a
-		0x06, 0x00, 0xff, 0x09, 0x60, // here 0x0a
-		0x75, 0x08, 0x95, 0x3f, 0x26,
-		0xff, 0x7f, 0x15, 0x00, 0x46,
-		0xff, 0x7f, 0x36, 0x00, 0x80,
-		0x91, 0x02, 0x85, 0x02, 0x09,
-		0x02, 0x81, 0x02, 0x09, 0x14,
-		0x85, 0x14, 0x81, 0x02, 0xc0,
-		0xc0,
-};
-
-static u8 spring_values[] = {
-		0xa6, 0x6a, 0xa6, 0x6a, 0xfe,
-		0xff, 0xfe, 0xff, 0xfe, 0xff,
-		0xfe, 0xff, 0xdf, 0x58, 0xa6,
-		0x6a, 0x06
-};
-
-static u8 damper_values[] = {
-		0xfc, 0x7f, 0xfc, 0x7f, 0xfe,
-		0xff, 0xfe, 0xff, 0xfe, 0xff,
-		0xfe, 0xff, 0xfc, 0x7f, 0xfc,
-		0x7f, 0x07
-};
+#endif /* __HID_TM300RS_H */