Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e64004d3 authored by Guang Zhu's avatar Guang Zhu Committed by Mike Lockwood
Browse files

adb: Use correct language ID when retrieving USB serial number. 



Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 63e61527

adb/usb_osx.c

+48 −24
Original line number Diff line number Diff line
@@ -197,12 +197,33 @@ AndroidInterfaceAdded(void *refCon, io_iterator_t iterator) 
	if (serialIndex > 0) {

		IOUSBDevRequest req;

		UInt16          buffer[256];

		UInt16          languages[128];



		memset(languages, 0, sizeof(languages));



		req.bmRequestType =

			USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);

		req.bRequest = kUSBRqGetDescriptor;

            req.wValue = (kUSBStringDesc << 8) | serialIndex;

		req.wValue = (kUSBStringDesc << 8) | 0;

		req.wIndex = 0;

		req.pData = languages;

		req.wLength = sizeof(languages);

		kr = (*dev)->DeviceRequest(dev, &req);



		if (kr == kIOReturnSuccess && req.wLenDone > 0) {



			int langCount = (req.wLenDone - 2) / 2, lang;



			for (lang = 1; lang <= langCount; lang++) {



                                memset(buffer, 0, sizeof(buffer));

                                memset(&req, 0, sizeof(req));



				req.bmRequestType =

					USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);

				req.bRequest = kUSBRqGetDescriptor;

				req.wValue = (kUSBStringDesc << 8) | serialIndex;

				req.wIndex = languages[lang];

				req.pData = buffer;

				req.wLength = sizeof(buffer);

				kr = (*dev)->DeviceRequest(dev, &req);
@@ -216,6 +237,9 @@ AndroidInterfaceAdded(void *refCon, io_iterator_t iterator) 
					for (i = 0; i < count; i++)

						serial[i] = buffer[i + 1];

					serial[i] = 0;

                                        break;

				}

			}

		}

	}

        (*dev)->Release(dev);