--- zzzz-none-000/linux-3.10.107/drivers/usb/core/generic.c 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/drivers/usb/core/generic.c 2021-11-10 11:53:55.000000000 +0000 @@ -20,6 +20,10 @@ #include #include #include "usb.h" +#ifdef CONFIG_AVM_POWERMETER +#include +#include +#endif /*--- #ifdef CONFIG_AVM_POWERMETER ---*/ static inline const char *plural(int n) { @@ -105,6 +109,71 @@ continue; } +#if defined(CONFIG_AVM_POWERMETER) + { + int hub_port; + enum _avm_hw_param param; +#if defined (CONFIG_MACH_AR934x) + //check if internal hub is not present + if (avm_get_hw_config(AVM_HW_CONFIG_VERSION, "usb_hub_external_port1", &hub_port, ¶m) != 0) { +#else + if (1) { +#endif + if (udev->level == 1) { + unsigned nextmA; + unsigned avm_powerdevice; + + if (udev->speed == USB_SPEED_SUPER) { + nextmA = (c->desc.bMaxPower * 8); + if (nextmA <= 150) { + nextmA = 150; + } + } else { + nextmA = (c->desc.bMaxPower * 2); + /* A device should display at least 100 mA in AVM_POWERMETER */ + if (nextmA < 100) { + nextmA = 100; + } + } + + + if (udev->parent->maxchild > 1) { + avm_powerdevice = (udev->portnum & 1)? powerdevice_usb_host : powerdevice_usb_host2; + printk (KERN_INFO "Port#%u config: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + } else { + avm_powerdevice = ((udev->bus->busnum &1) == 1)? powerdevice_usb_host : powerdevice_usb_host2; + printk (KERN_INFO "Bus#%u config: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA); + } + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } else { + if (udev->level == 2) { + unsigned avm_powerdevice = 0; + if (udev->portnum == hub_port) { + avm_powerdevice = powerdevice_usb_host; + } else { + if (avm_get_hw_config(AVM_HW_CONFIG_VERSION, "usb_hub_external_port2", &hub_port, ¶m) == 0) { + if (udev->portnum == hub_port) { + avm_powerdevice = powerdevice_usb_host2; + } + } + } + if (avm_powerdevice) { + unsigned nextmA = (c->desc.bMaxPower * 2); + + /* A device should display at least 100 mA in AVM_POWERMETER */ + if (nextmA < 100) { + nextmA = 100; + } + printk (KERN_INFO "HubPort#%u config: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } + } + } +#endif // CONFIG_AVM_POWERMETER + + /* When the first config's first interface is one of Microsoft's * pet nonstandard Ethernet-over-USB protocols, ignore it unless * this kernel has enabled the necessary host side driver. @@ -165,6 +234,10 @@ */ if (udev->authorized == 0) dev_err(&udev->dev, "Device is not authorized for usage\n"); +#if 1 /* == 20150309 AVM/WK Extension == */ + else if (udev->noprobe) + dev_err(&udev->dev, "Probing is disabled for this device\n"); +#endif else { c = usb_choose_configuration(udev); if (c >= 0) {