Skip to contentSkip to conversation

adbhid: make KEY_SYSRQ configurable on ADB based machines

PATCH In review Aristeu Sergio Rozanski Filho 2 participants 6 messages Aug 8, 2006 – Sep 25, 2006 Linux for power macintosh

lore
Share & tools
lore

Aristeu Sergio Rozanski Filho

author
#0 lore raw

PATCH 1/1 adbhid: make KEY_SYSRQ configurable on ADB based machines

This patch adds a sysfs entry on /sys/class/adb/keyboard0/sysrq_key to configure which key will be mapped to KEY_SYSRQ. This is needed to make sysrq usable on machines which doesn't have current sysrq key. This patch and the previous two ones has been tested for some days in my machine without problems.

Signed-off-by Aristeu S. Rozanski F. <[email protected]>
Acked-by Michael Hanselmann <[email protected]>
drivers/macintosh/adbhid.c +49 -3
Index: ppc-2.6/drivers/macintosh/adbhid.c
===================================================================
@@ -61,6 +61,47 @@
 	.notifier_call	= adb_message_handler,
 };
 
+/* SYSRQ support */
+#ifdef CONFIG_MAGIC_SYSRQ
+static int adbhid_sysrq_key = 0x69;
+
+static ssize_t adbhid_show_sysrq_key(struct class_device *dev, char *buf)
+{
+	return sprintf(buf, "%#x\n", adbhid_sysrq_key);
+}
+static ssize_t adbhid_store_sysrq_key(struct class_device *dev,
+				      const char *buf, size_t n)
+{
+	int val;
+
+	val = simple_strtol(buf, NULL, 10);
+	if (val > 255)
+		return -EINVAL;
+	adbhid_sysrq_key = val;
+
+	return n;
+}
+
+static CLASS_DEVICE_ATTR(sysrq_key, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
+			 adbhid_show_sysrq_key, adbhid_store_sysrq_key);
+static inline int adbhid_key_is_sysrq(int keycode)
+{
+	if (unlikely(keycode == adbhid_sysrq_key))
+		return KEY_SYSRQ;
+	return 0;
+}
+
+static inline void adbhid_register_sysrq_attr(struct class_device *dev)
+{
+	class_device_create_file(dev, &class_device_attr_sysrq_key);
+}
+#define adbhid_set_sysrq(x) set_bit(KEY_SYSRQ, (x))
+#else	/* !CONFIG_MAGIC_SYSRQ */
+#define adbhid_key_is_sysrq(x) (0)
+#define adbhid_register_sysrq_attr(x) do { } while(0)
+#define adbhid_set_sysrq(x) do { } while(0)
+#endif	/* CONFIG_MAGIC_SYSRQ */
+
 /* Some special keys */
 #define ADB_KEY_DEL		0x33
 #define ADB_KEY_CMD		0x37

@@ -176,7 +217,7 @@
 	/* 0x66 */ KEY_HANJA,		/* 123 */
 	/* 0x67 */ KEY_F11,		/*  87 */
 	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
+	/* 0x69 */ 0,
 	/* 0x6a */ 0,
 	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
 	/* 0x6c */ 0,

@@ -275,7 +316,7 @@
 adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
 {
 	struct adbhid *ahid = adbhid[id];
-	int up_flag, key;
+	int up_flag, key = 0;
 
 	up_flag = (keycode & 0x80);
 	keycode &= 0x7f;

@@ -336,7 +377,9 @@
 #endif /* CONFIG_PPC_PMAC */
 	}
 
-	key = adbhid[id]->keycode[keycode];
+	key = adbhid_key_is_sysrq(keycode);
+	if (!key)
+		key = adbhid[id]->keycode[keycode];
 	if (key) {
 		input_regs(adbhid[id]->input, regs);
 		input_report_key(adbhid[id]->input, key, !up_flag);

@@ -759,6 +802,7 @@
 		for (i = 0; i < 128; i++)
 			if (hid->keycode[i])
 				set_bit(hid->keycode[i], input_dev->keybit);
+		adbhid_set_sysrq(input_dev->keybit);
 
 		input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
 		input_dev->ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML);

@@ -901,6 +945,8 @@
 		adb_get_infos(id, &default_id, &cur_handler_id);
 		reg |= adbhid_input_reregister(id, default_id, org_handler_id,
 					       cur_handler_id, 0);
+
+		adbhid_register_sysrq_attr(keyboard_ids.device[i]);
 	}
 
 	for (i = 0; i < buttons_ids.nids; i++) {
author
#1 lore raw
Quoted 5 lines

This patch adds a sysfs entry on /sys/class/adb/keyboard0/sysrq_key to configure which key will be mapped to KEY_SYSRQ. This is needed to make sysrq usable on machines which doesn't have current sysrq key. This patch and the previous two ones has been tested for some days in my machine without problems.

any comments on this one?

Quoted 105 lines
Signed-off-by Aristeu S. Rozanski F. <[email protected]>
Acked-by Michael Hanselmann <[email protected]>

Index: ppc-2.6/drivers/macintosh/adbhid.c
===================================================================

drivers/macintosh/adbhid.c +49 -3
@@ -61,6 +61,47 @@
 	.notifier_call	= adb_message_handler,
 };
 
+/* SYSRQ support */
+#ifdef CONFIG_MAGIC_SYSRQ
+static int adbhid_sysrq_key = 0x69;
+
+static ssize_t adbhid_show_sysrq_key(struct class_device *dev, char *buf)
+{
+	return sprintf(buf, "%#x\n", adbhid_sysrq_key);
+}
+static ssize_t adbhid_store_sysrq_key(struct class_device *dev,
+				      const char *buf, size_t n)
+{
+	int val;
+
+	val = simple_strtol(buf, NULL, 10);
+	if (val > 255)
+		return -EINVAL;
+	adbhid_sysrq_key = val;
+
+	return n;
+}
+
+static CLASS_DEVICE_ATTR(sysrq_key, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
+			 adbhid_show_sysrq_key, adbhid_store_sysrq_key);
+static inline int adbhid_key_is_sysrq(int keycode)
+{
+	if (unlikely(keycode == adbhid_sysrq_key))
+		return KEY_SYSRQ;
+	return 0;
+}
+
+static inline void adbhid_register_sysrq_attr(struct class_device *dev)
+{
+	class_device_create_file(dev, &class_device_attr_sysrq_key);
+}
+#define adbhid_set_sysrq(x) set_bit(KEY_SYSRQ, (x))
+#else	/* !CONFIG_MAGIC_SYSRQ */
+#define adbhid_key_is_sysrq(x) (0)
+#define adbhid_register_sysrq_attr(x) do { } while(0)
+#define adbhid_set_sysrq(x) do { } while(0)
+#endif	/* CONFIG_MAGIC_SYSRQ */
+
 /* Some special keys */
 #define ADB_KEY_DEL		0x33
 #define ADB_KEY_CMD		0x37

@@ -176,7 +217,7 @@
 	/* 0x66 */ KEY_HANJA,		/* 123 */
 	/* 0x67 */ KEY_F11,		/*  87 */
 	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
+	/* 0x69 */ 0,
 	/* 0x6a */ 0,
 	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
 	/* 0x6c */ 0,

@@ -275,7 +316,7 @@
 adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
 {
 	struct adbhid *ahid = adbhid[id];
-	int up_flag, key;
+	int up_flag, key = 0;
 
 	up_flag = (keycode & 0x80);
 	keycode &= 0x7f;

@@ -336,7 +377,9 @@
 #endif /* CONFIG_PPC_PMAC */
 	}
 
-	key = adbhid[id]->keycode[keycode];
+	key = adbhid_key_is_sysrq(keycode);
+	if (!key)
+		key = adbhid[id]->keycode[keycode];
 	if (key) {
 		input_regs(adbhid[id]->input, regs);
 		input_report_key(adbhid[id]->input, key, !up_flag);

@@ -759,6 +802,7 @@
 		for (i = 0; i < 128; i++)
 			if (hid->keycode[i])
 				set_bit(hid->keycode[i], input_dev->keybit);
+		adbhid_set_sysrq(input_dev->keybit);
 
 		input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
 		input_dev->ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML);

@@ -901,6 +945,8 @@
 		adb_get_infos(id, &default_id, &cur_handler_id);
 		reg |= adbhid_input_reregister(id, default_id, org_handler_id,
 					       cur_handler_id, 0);
+
+		adbhid_register_sysrq_attr(keyboard_ids.device[i]);
 	}
 
 	for (i = 0; i < buttons_ids.nids; i++) {

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Signature · 1 line
Aristeu
#2 lore raw
Quoted 6 lines · Aristeu Sergio Rozanski Filho
Quoted 5 lines

This patch adds a sysfs entry on /sys/class/adb/keyboard0/sysrq_key to configure which key will be mapped to KEY_SYSRQ. This is needed to make sysrq usable on machines which doesn't have current sysrq key. This patch and the previous two ones has been tested for some days in my machine without problems.

any comments on this one?

The only thing I see is that each ADB keyboard device will have an entry in sysfs to change the sysrq key, but they will all set the same global. It's a little misleading, but I don't think it's a major issue. And before anyone asks, I have in fact had multiple ADB keyboards attached to a single machine. It was useful for multi-player games.

Brad Boyer
[email protected]

author
#3 lore raw
Quoted 6 lines · Aristeu Sergio Rozanski Filho
Quoted 5 lines
Quoted 5 lines

This patch adds a sysfs entry on /sys/class/adb/keyboard0/sysrq_key to configure which key will be mapped to KEY_SYSRQ. This is needed to make sysrq usable on machines which doesn't have current sysrq key. This patch and the previous two ones has been tested for some days in my machine without problems.

Quoted 7 lines
Quoted 1 line

any comments on this one?

The only thing I see is that each ADB keyboard device will have an entry in sysfs to change the sysrq key, but they will all set the same global. It's a little misleading, but I don't think it's a major issue. And before anyone asks, I have in fact had multiple ADB keyboards attached to a single machine. It was useful for multi-player games.

yup, I was expecting someone to show up and say it's possible :) I'll fix this up, thanks Brad

Signature · 1 line
Aristeu
author
#4 lore raw
In reply to Brad Boyer

Hi Brad,

Quoted 5 lines

The only thing I see is that each ADB keyboard device will have an entry in sysfs to change the sysrq key, but they will all set the same global. It's a little misleading, but I don't think it's a major issue. And before anyone asks, I have in fact had multiple ADB keyboards attached to a single machine. It was useful for multi-player games.

what about this updated patch?

Signature · 1 line
Aristeu
author
#5 lore raw
Quoted 7 lines

Hi Brad,

Quoted 5 lines

The only thing I see is that each ADB keyboard device will have an entry in sysfs to change the sysrq key, but they will all set the same global. It's a little misleading, but I don't think it's a major issue. And before anyone asks, I have in fact had multiple ADB keyboards attached to a single machine. It was useful for multi-player games.

what about this updated patch?

If I attach the patch surely will help... :P

drivers/macintosh/adbhid.c +62 -3
@@ -176,7 +176,7 @@
 	/* 0x66 */ KEY_HANJA,		/* 123 */
 	/* 0x67 */ KEY_F11,		/*  87 */
 	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
+	/* 0x69 */ 0,
 	/* 0x6a */ 0,
 	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
 	/* 0x6c */ 0,

@@ -212,6 +212,7 @@
 	char name[64];
 	char phys[32];
 	int flags;
+	int sysrq_key;
 };
 
 #define FLAG_FN_KEY_PRESSED	0x00000001

@@ -252,6 +253,58 @@
 #define ADBMOUSE_MS_A3		8	/* Mouse systems A3 trackball (handler 3) */
 #define ADBMOUSE_MACALLY2	9	/* MacAlly 2-button mouse */
 
+/* SYSRQ support */
+#ifdef CONFIG_MAGIC_SYSRQ
+#define ADBHID_DEFAULT_SYSRQ 0x69
+#define class_device_to_adbhid(x) ((struct adbhid *)(x->class_data))
+
+static ssize_t adbhid_show_sysrq_key(struct class_device *dev, char *buf)
+{
+	struct adbhid *hid = class_device_to_adbhid(dev);
+
+	return sprintf(buf, "%#x\n", hid->sysrq_key);
+}
+static ssize_t adbhid_store_sysrq_key(struct class_device *dev,
+				      const char *buf, size_t n)
+{
+	int val;
+	struct adbhid *hid = class_device_to_adbhid(dev);
+
+	val = simple_strtol(buf, NULL, 10);
+	if (val > 255)
+		return -EINVAL;
+	hid->sysrq_key = val;
+
+	return n;
+}
+
+static CLASS_DEVICE_ATTR(sysrq_key, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
+			 adbhid_show_sysrq_key, adbhid_store_sysrq_key);
+static inline int adbhid_key_is_sysrq(struct adbhid *hid, int keycode)
+{
+	if (unlikely(keycode == hid->sysrq_key))
+		return KEY_SYSRQ;
+	return 0;
+}
+
+static inline void adbhid_register_sysrq_attr(struct adbhid *hid,
+					      struct class_device *dev)
+{
+	dev->class_data = hid;
+	class_device_create_file(dev, &class_device_attr_sysrq_key);
+}
+#define adbhid_set_sysrq(x) set_bit(KEY_SYSRQ, (x))
+static inline void adbhid_set_default_sysrq(struct adbhid *hid)
+{
+	hid->sysrq_key = ADBHID_DEFAULT_SYSRQ;
+}
+#else	/* !CONFIG_MAGIC_SYSRQ */
+#define adbhid_key_is_sysrq(x, y) (0)
+#define adbhid_register_sysrq_attr(x, y) do { } while(0)
+#define adbhid_set_sysrq(x) do { } while(0)
+#define adbhid_set_default_sysrq(x) do { } while(0)
+#endif	/* CONFIG_MAGIC_SYSRQ */
+
 static void
 adbhid_keyboard_input(unsigned char *data, int nb, struct pt_regs *regs, int apoll)
 {

@@ -275,7 +328,7 @@
 adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
 {
 	struct adbhid *ahid = adbhid[id];
-	int up_flag, key;
+	int up_flag, key = 0;
 
 	up_flag = (keycode & 0x80);
 	keycode &= 0x7f;

@@ -336,7 +389,9 @@
 #endif /* CONFIG_PPC_PMAC */
 	}
 
-	key = adbhid[id]->keycode[keycode];
+	key = adbhid_key_is_sysrq(adbhid[id], keycode);
+	if (!key)
+		key = adbhid[id]->keycode[keycode];
 	if (key) {
 		input_regs(adbhid[id]->input, regs);
 		input_report_key(adbhid[id]->input, key, !up_flag);

@@ -705,6 +760,7 @@
 	hid->current_handler_id = current_handler_id;
 	hid->mouse_kind = mouse_kind;
 	hid->flags = 0;
+	adbhid_set_default_sysrq(hid);
 	input_dev->private = hid;
 	input_dev->name = hid->name;
 	input_dev->phys = hid->phys;

@@ -759,6 +815,7 @@
 		for (i = 0; i < 128; i++)
 			if (hid->keycode[i])
 				set_bit(hid->keycode[i], input_dev->keybit);
+		adbhid_set_sysrq(input_dev->keybit);
 
 		input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
 		input_dev->ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML);

@@ -901,6 +958,8 @@
 		adb_get_infos(id, &default_id, &cur_handler_id);
 		reg |= adbhid_input_reregister(id, default_id, org_handler_id,
 					       cur_handler_id, 0);
+
+		adbhid_register_sysrq_attr(adbhid[id], keyboard_ids.device[i]);
 	}
 
 	for (i = 0; i < buttons_ids.nids; i++) {