mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/macintosh/adb.c
..
..
@@ -163,7 +163,7 @@
163
163
 			 * See if anybody actually moved. This is suggested
164
164
 			 * by HW TechNote 01:
165
165
 			 *
166
-			 * http://developer.apple.com/technotes/hw/hw_01.html
166
+			 * https://developer.apple.com/technotes/hw/hw_01.html
167
167
 			 */
168
168
 			adb_request(&req, NULL, ADBREQ_SYNC | ADBREQ_REPLY, 1,
169
169
 				    (highFree << 4) | 0xf);
..
..
@@ -203,15 +203,15 @@
203
203
 	}
204
204
 
205
205
 	/* Now fill in the handler_id field of the adb_handler entries. */
206
-	pr_debug("adb devices:\n");
207
206
 	for (i = 1; i < 16; i++) {
208
207
 		if (adb_handler[i].original_address == 0)
209
208
 			continue;
210
209
 		adb_request(&req, NULL, ADBREQ_SYNC | ADBREQ_REPLY, 1,
211
210
 			    (i << 4) | 0xf);
212
211
 		adb_handler[i].handler_id = req.reply[2];
213
-		pr_debug(" [%d]: %d %x\n", i, adb_handler[i].original_address,
214
-			 adb_handler[i].handler_id);
212
+		printk(KERN_DEBUG "adb device [%d]: %d 0x%X\n", i,
213
+		       adb_handler[i].original_address,
214
+		       adb_handler[i].handler_id);
215
215
 		devmask |= 1 << i;
216
216
 	}
217
217
 	return devmask;
..
..
@@ -579,6 +579,8 @@
579
579
 	mutex_lock(&adb_handler_mutex);
580
580
 	ret = try_handler_change(address, new_id);
581
581
 	mutex_unlock(&adb_handler_mutex);
582
+	if (ret)
583
+		pr_debug("adb handler change: [%d] 0x%X\n", address, new_id);
582
584
 	return ret;
583
585
 }
584
586
 EXPORT_SYMBOL(adb_try_handler_change);
..
..
@@ -645,7 +647,7 @@
645
647
 
646
648
 	switch(req->data[1]) {
647
649
 	case ADB_QUERY_GETDEVINFO:
648
-		if (req->nbytes < 3)
650
+		if (req->nbytes < 3 || req->data[2] >= 16)
649
651
 			break;
650
652
 		mutex_lock(&adb_handler_mutex);
651
653
 		req->reply[0] = adb_handler[req->data[2]].original_address;