usbmass: bd.devNr is usb port number

0=first port
1=second port

Also move devNr responsibility 1 layer down, from scsi to usbmass.

Author: rickgaiser

iop/usb/usbmass_bd/src/imports.lst

@@ -36,4 +36,5 @@ I_sceUsbdClosePipe
 I_sceUsbdSetPrivateData
 I_sceUsbdTransferPipe
 I_sceUsbdRegisterLdd
+I_sceUsbdGetDeviceLocation
 usbd_IMPORTS_end

iop/usb/usbmass_bd/src/include/scsi.h

@@ -5,6 +5,7 @@ struct scsi_interface
 {
     void *priv;
     char *name;
+    unsigned int devNr;
     unsigned int max_sectors;
 
     int (*get_max_lun)(struct scsi_interface *scsi);

iop/usb/usbmass_bd/src/scsi.c

@@ -300,6 +300,7 @@ void scsi_connect(struct scsi_interface *scsi)
 
             bd->priv = scsi;
             bd->name = scsi->name;
+            bd->devNr = scsi->devNr;
             scsi_warmup(bd);
             bdm_connect_bd(bd);
             break;
@@ -330,7 +331,6 @@ int scsi_init(void)
     M_DEBUG("%s\n", __func__);
 
     for (i = 0; i < NUM_DEVICES; ++i) {
-        g_scsi_bd[i].devNr = i;
         g_scsi_bd[i].parNr = 0;
         g_scsi_bd[i].parId = 0x00;
 

iop/usb/usbmass_bd/src/usb_mass.c

@@ -764,7 +764,9 @@ static void usb_mass_update(void *arg)
         for (i = 0; i < new_devs_count; i += 1) {
             mass_dev *dev = new_devs[i];
             {
+                u8 path[16] = {0};
                 int ret;
+
                 if ((ret = usb_set_configuration(dev, dev->configId)) != USB_RC_OK) {
                     M_PRINTF("ERROR: sending set_configuration %d\n", ret);
                     usb_mass_release(dev);
@@ -784,6 +786,14 @@ static void usb_mass_update(void *arg)
                     }
                 }
 
+                sceUsbdGetDeviceLocation(dev->devId, path);
+                if (path[0] == 1)
+                    dev->scsi.devNr = 0; // first USB port
+                else if  (path[0] == 2)
+                    dev->scsi.devNr = 1; // second USB port
+                else
+                    dev->scsi.devNr = 2; // hub?
+
                 dev->status |= USBMASS_DEV_STAT_CONF;
                 scsi_connect(&dev->scsi);