macintosh/adb: Properly mark continued kernel messages (f2be6295) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/macintosh/adb.c

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -203,18 +203,17 @@ static int adb_scan_bus(void)
	}		}

	/* Now fill in the handler_id field of the adb_handler entries. */		/* Now fill in the handler_id field of the adb_handler entries. */
	printk(KERN_DEBUG "adb devices:");		pr_debug("adb devices:\n");
	for (i = 1; i < 16; i++) {		for (i = 1; i < 16; i++) {
	if (adb_handler[i].original_address == 0)		if (adb_handler[i].original_address == 0)
	continue;		continue;
	adb_request(&req, NULL, ADBREQ_SYNC \| ADBREQ_REPLY, 1,		adb_request(&req, NULL, ADBREQ_SYNC \| ADBREQ_REPLY, 1,
	(i << 4) \| 0xf);		(i << 4) \| 0xf);
	adb_handler[i].handler_id = req.reply[2];		adb_handler[i].handler_id = req.reply[2];
	printk(" [%d]: %d %x", i, adb_handler[i].original_address,		pr_debug(" [%d]: %d %x\n", i, adb_handler[i].original_address,
	adb_handler[i].handler_id);		adb_handler[i].handler_id);
	devmask \|= 1 << i;		devmask \|= 1 << i;
	}		}
	printk("\n");
	return devmask;		return devmask;
	}		}

	@@ -225,9 +224,9 @@ static int adb_scan_bus(void)
	static int		static int
	adb_probe_task(void *x)		adb_probe_task(void *x)
	{		{
	printk(KERN_INFO "adb: starting probe task...\n");		pr_debug("adb: starting probe task...\n");
	do_adb_reset_bus();		do_adb_reset_bus();
	printk(KERN_INFO "adb: finished probe task...\n");		pr_debug("adb: finished probe task...\n");

	up(&adb_probe_mutex);		up(&adb_probe_mutex);

	@@ -337,7 +336,7 @@ static int __init adb_init(void)
	adb_controller->init())		adb_controller->init())
	adb_controller = NULL;		adb_controller = NULL;
	if (adb_controller == NULL) {		if (adb_controller == NULL) {
	printk(KERN_WARNING "Warning: no ADB interface detected\n");		pr_warn("Warning: no ADB interface detected\n");
	} else {		} else {
	#ifdef CONFIG_PPC		#ifdef CONFIG_PPC
	if (of_machine_is_compatible("AAPL,PowerBook1998") \|\|		if (of_machine_is_compatible("AAPL,PowerBook1998") \|\|
	@@ -480,8 +479,7 @@ adb_register(int default_id, int handler_id, struct adb_ids *ids,
	(!handler_id \|\| (handler_id == adb_handler[i].handler_id) \|\|		(!handler_id \|\| (handler_id == adb_handler[i].handler_id) \|\|
	try_handler_change(i, handler_id))) {		try_handler_change(i, handler_id))) {
	if (adb_handler[i].handler != 0) {		if (adb_handler[i].handler != 0) {
	printk(KERN_ERR		pr_err("Two handlers for ADB device %d\n",
	"Two handlers for ADB device %d\n",
	default_id);		default_id);
	continue;		continue;
	}		}
	@@ -535,10 +533,10 @@ adb_input(unsigned char *buf, int nb, int autopoll)

	id = buf[0] >> 4;		id = buf[0] >> 4;
	if (dump_adb_input) {		if (dump_adb_input) {
	printk(KERN_INFO "adb packet: ");		pr_info("adb packet: ");
	for (i = 0; i < nb; ++i)		for (i = 0; i < nb; ++i)
	printk(" %x", buf[i]);		pr_cont(" %x", buf[i]);
	printk(", id = %d\n", id);		pr_cont(", id = %d\n", id);
	}		}
	write_lock_irqsave(&adb_handler_lock, flags);		write_lock_irqsave(&adb_handler_lock, flags);
	handler = adb_handler[id].handler;		handler = adb_handler[id].handler;
	@@ -884,7 +882,7 @@ static void __init
	adbdev_init(void)		adbdev_init(void)
	{		{
	if (register_chrdev(ADB_MAJOR, "adb", &adb_fops)) {		if (register_chrdev(ADB_MAJOR, "adb", &adb_fops)) {
	printk(KERN_ERR "adb: unable to get major %d\n", ADB_MAJOR);		pr_err("adb: unable to get major %d\n", ADB_MAJOR);
	return;		return;
	}		}

drivers/macintosh/adbhid.c

+27 −28

Original line number	Original line	Diff line number	Diff line
	@@ -268,7 +268,7 @@ adbhid_keyboard_input(unsigned char *data, int nb, int apoll)
	int id = (data[0] >> 4) & 0x0f;		int id = (data[0] >> 4) & 0x0f;

	if (!adbhid[id]) {		if (!adbhid[id]) {
	printk(KERN_ERR "ADB HID on ID %d not yet registered, packet %#02x, %#02x, %#02x, %#02x\n",		pr_err("ADB HID on ID %d not yet registered, packet %#02x, %#02x, %#02x, %#02x\n",
	id, data[0], data[1], data[2], data[3]);		id, data[0], data[1], data[2], data[3]);
	return;		return;
	}		}
	@@ -320,8 +320,7 @@ adbhid_input_keycode(int id, int scancode, int repeat)
	ahid->flags &= ~FLAG_CAPSLOCK_TRANSLATE;		ahid->flags &= ~FLAG_CAPSLOCK_TRANSLATE;
	}		}
	} else {		} else {
	printk(KERN_INFO "Spurious caps lock event "		pr_info("Spurious caps lock event (scancode 0xff).\n");
	"(scancode 0xff).\n");
	}		}
	}		}
	}		}
	@@ -397,7 +396,7 @@ adbhid_input_keycode(int id, int scancode, int repeat)
	input_report_key(adbhid[id]->input, key, !up_flag);		input_report_key(adbhid[id]->input, key, !up_flag);
	input_sync(adbhid[id]->input);		input_sync(adbhid[id]->input);
	} else		} else
	printk(KERN_INFO "Unhandled ADB key (scancode %#02x) %s.\n", keycode,		pr_info("Unhandled ADB key (scancode %#02x) %s.\n", keycode,
	up_flag ? "released" : "pressed");		up_flag ? "released" : "pressed");

	}		}
	@@ -408,7 +407,7 @@ adbhid_mouse_input(unsigned char *data, int nb, int autopoll)
	int id = (data[0] >> 4) & 0x0f;		int id = (data[0] >> 4) & 0x0f;

	if (!adbhid[id]) {		if (!adbhid[id]) {
	printk(KERN_ERR "ADB HID on ID %d not yet registered\n", id);		pr_err("ADB HID on ID %d not yet registered\n", id);
	return;		return;
	}		}

	@@ -506,7 +505,7 @@ adbhid_buttons_input(unsigned char *data, int nb, int autopoll)
	int id = (data[0] >> 4) & 0x0f;		int id = (data[0] >> 4) & 0x0f;

	if (!adbhid[id]) {		if (!adbhid[id]) {
	printk(KERN_ERR "ADB HID on ID %d not yet registered\n", id);		pr_err("ADB HID on ID %d not yet registered\n", id);
	return;		return;
	}		}

	@@ -534,7 +533,7 @@ adbhid_buttons_input(unsigned char *data, int nb, int autopoll)
	break;		break;

	default:		default:
	printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",		pr_info("Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
	data[0], data[1], data[2], data[3]);		data[0], data[1], data[2], data[3]);
	break;		break;
	}		}
	@@ -609,13 +608,13 @@ adbhid_buttons_input(unsigned char *data, int nb, int autopoll)
	break;		break;

	default:		default:
	printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",		pr_info("Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
	data[0], data[1], data[2], data[3]);		data[0], data[1], data[2], data[3]);
	break;		break;
	}		}
	break;		break;
	default:		default:
	printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",		pr_info("Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
	data[0], data[1], data[2], data[3]);		data[0], data[1], data[2], data[3]);
	break;		break;
	}		}
	@@ -760,7 +759,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
	int i;		int i;

	if (adbhid[id]) {		if (adbhid[id]) {
	printk(KERN_ERR "Trying to reregister ADB HID on ID %d\n", id);		pr_err("Trying to reregister ADB HID on ID %d\n", id);
	return -EEXIST;		return -EEXIST;
	}		}

	@@ -799,24 +798,24 @@ adbhid_input_register(int id, int default_id, int original_handler_id,

	memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));		memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));

	printk(KERN_INFO "Detected ADB keyboard, type ");		pr_info("Detected ADB keyboard, type ");
	switch (original_handler_id) {		switch (original_handler_id) {
	default:		default:
	printk("<unknown>.\n");		pr_cont("<unknown>.\n");
	input_dev->id.version = ADB_KEYBOARD_UNKNOWN;		input_dev->id.version = ADB_KEYBOARD_UNKNOWN;
	break;		break;

	case 0x01: case 0x02: case 0x03: case 0x06: case 0x08:		case 0x01: case 0x02: case 0x03: case 0x06: case 0x08:
	case 0x0C: case 0x10: case 0x18: case 0x1B: case 0x1C:		case 0x0C: case 0x10: case 0x18: case 0x1B: case 0x1C:
	case 0xC0: case 0xC3: case 0xC6:		case 0xC0: case 0xC3: case 0xC6:
	printk("ANSI.\n");		pr_cont("ANSI.\n");
	input_dev->id.version = ADB_KEYBOARD_ANSI;		input_dev->id.version = ADB_KEYBOARD_ANSI;
	break;		break;

	case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:		case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:
	case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:		case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:
	case 0xC4: case 0xC7:		case 0xC4: case 0xC7:
	printk("ISO, swapping keys.\n");		pr_cont("ISO, swapping keys.\n");
	input_dev->id.version = ADB_KEYBOARD_ISO;		input_dev->id.version = ADB_KEYBOARD_ISO;
	i = hid->keycode[10];		i = hid->keycode[10];
	hid->keycode[10] = hid->keycode[50];		hid->keycode[10] = hid->keycode[50];
	@@ -825,7 +824,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,

	case 0x12: case 0x15: case 0x16: case 0x17: case 0x1A:		case 0x12: case 0x15: case 0x16: case 0x17: case 0x1A:
	case 0x1E: case 0xC2: case 0xC5: case 0xC8: case 0xC9:		case 0x1E: case 0xC2: case 0xC5: case 0xC8: case 0xC9:
	printk("JIS.\n");		pr_cont("JIS.\n");
	input_dev->id.version = ADB_KEYBOARD_JIS;		input_dev->id.version = ADB_KEYBOARD_JIS;
	break;		break;
	}		}
	@@ -884,7 +883,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
	/* else fall through */		/* else fall through */

	default:		default:
	printk(KERN_INFO "Trying to register unknown ADB device to input layer.\n");		pr_info("Trying to register unknown ADB device to input layer.\n");
	err = -ENODEV;		err = -ENODEV;
	goto fail;		goto fail;
	}		}
	@@ -1073,12 +1072,12 @@ adbhid_probe(void)
	(req.reply[1] == 0x4b) && (req.reply[2] == 0x4f) &&		(req.reply[1] == 0x4b) && (req.reply[2] == 0x4f) &&
	(req.reply[3] == 0x49) && (req.reply[4] == 0x54)) {		(req.reply[3] == 0x49) && (req.reply[4] == 0x54)) {
	if (adb_try_handler_change(id, 0x42)) {		if (adb_try_handler_change(id, 0x42)) {
	printk("\nADB MacAlly 2-button mouse at %d, handler set to 0x42", id);		pr_cont("\nADB MacAlly 2-button mouse at %d, handler set to 0x42", id);
	mouse_kind = ADBMOUSE_MACALLY2;		mouse_kind = ADBMOUSE_MACALLY2;
	}		}
	}		}
	}		}
	printk("\n");		pr_cont("\n");

	adb_get_infos(id, &default_id, &cur_handler_id);		adb_get_infos(id, &default_id, &cur_handler_id);
	reg \|= adbhid_input_reregister(id, default_id, org_handler_id,		reg \|= adbhid_input_reregister(id, default_id, org_handler_id,
	@@ -1093,12 +1092,12 @@ init_trackpad(int id)
	struct adb_request req;		struct adb_request req;
	unsigned char r1_buffer[8];		unsigned char r1_buffer[8];

	printk(" (trackpad)");		pr_cont(" (trackpad)");

	adb_request(&req, NULL, ADBREQ_SYNC \| ADBREQ_REPLY, 1,		adb_request(&req, NULL, ADBREQ_SYNC \| ADBREQ_REPLY, 1,
	ADB_READREG(id,1));		ADB_READREG(id,1));
	if (req.reply_len < 8)		if (req.reply_len < 8)
	printk("bad length for reg. 1\n");		pr_cont("bad length for reg. 1\n");
	else		else
	{		{
	memcpy(r1_buffer, &req.reply[1], 8);		memcpy(r1_buffer, &req.reply[1], 8);
	@@ -1146,7 +1145,7 @@ init_trackball(int id)
	{		{
	struct adb_request req;		struct adb_request req;

	printk(" (trackman/mouseman)");		pr_cont(" (trackman/mouseman)");

	adb_request(&req, NULL, ADBREQ_SYNC, 3,		adb_request(&req, NULL, ADBREQ_SYNC, 3,
	ADB_WRITEREG(id,1), 00,0x81);		ADB_WRITEREG(id,1), 00,0x81);
	@@ -1178,7 +1177,7 @@ init_turbomouse(int id)
	{		{
	struct adb_request req;		struct adb_request req;

	printk(" (TurboMouse 5)");		pr_cont(" (TurboMouse 5)");

	adb_request(&req, NULL, ADBREQ_SYNC, 1, ADB_FLUSH(id));		adb_request(&req, NULL, ADBREQ_SYNC, 1, ADB_FLUSH(id));

	@@ -1214,7 +1213,7 @@ init_microspeed(int id)
	{		{
	struct adb_request req;		struct adb_request req;

	printk(" (Microspeed/MacPoint or compatible)");		pr_cont(" (Microspeed/MacPoint or compatible)");

	adb_request(&req, NULL, ADBREQ_SYNC, 1, ADB_FLUSH(id));		adb_request(&req, NULL, ADBREQ_SYNC, 1, ADB_FLUSH(id));

	@@ -1254,7 +1253,7 @@ init_ms_a3(int id)
	{		{
	struct adb_request req;		struct adb_request req;

	printk(" (Mouse Systems A3 Mouse, or compatible)");		pr_cont(" (Mouse Systems A3 Mouse, or compatible)");
	adb_request(&req, NULL, ADBREQ_SYNC, 3,		adb_request(&req, NULL, ADBREQ_SYNC, 3,
	ADB_WRITEREG(id, 0x2),		ADB_WRITEREG(id, 0x2),
	0x00,		0x00,