Revert "Removal of NCM usb gadget ethernet device after discussion with team"

This reverts commit ab19504.

Author: aentinger

recipes-devtools/android-tools/android-tools/android-tools-adbd.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Android Debug Bridge & Usb ACM
+Description=Android Debug Bridge & Usb NCM
 ConditionPathExists=/sys/class/typec/port0/data_role
 After=network-pre.target dbus.service
 Before=android-system.service

recipes-devtools/android-tools/android-tools/arduino-android-gadget-setup

@@ -35,7 +35,7 @@ start()
 
         # populate config, optional
         mkdir configs/c.1/strings/0x409
-        echo \"adb+acm\" > configs/c.1/strings/0x409/configuration
+        echo \"adb+acm+ncm\" > configs/c.1/strings/0x409/configuration
         echo 900 > configs/c.1/MaxPower
 
         # create a generic ffs for adb
@@ -44,6 +44,12 @@ start()
         # create the acm (serial) function
         mkdir functions/acm.GS0
 
+        # create the ncm function
+        mkdir functions/ncm.usb0
+
+        # assign ncm function to configuration
+        ln -s functions/ncm.usb0/ configs/c.1
+
         # assign acm function to configuration
         ln -s functions/acm.GS0 configs/c.1
 

recipes-support/arduino-ootb/arduino-ootb.bb

@@ -7,6 +7,7 @@ RDEPENDS:${PN} += "systemd"
 SRC_URI = " \
     file://connection-status-led.timer \
     file://connection-status-led.service \
+    file://ncm-network.service \
     file://secure-device.service \
     file://create-docker-envfile.service \
     file://offline-update.service \
@@ -15,12 +16,13 @@ SRC_URI = " \
 
 inherit systemd
 
-SYSTEMD_SERVICE:${PN} = "connection-status-led.timer connection-status-led.service secure-device.service create-docker-envfile.service offline-update.service"
+SYSTEMD_SERVICE:${PN} = "connection-status-led.timer connection-status-led.service ncm-network.service secure-device.service create-docker-envfile.service offline-update.service"
 
 do_install() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/connection-status-led.timer ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/connection-status-led.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${WORKDIR}/ncm-network.service ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/secure-device.service ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/create-docker-envfile.service ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/offline-update.service ${D}${systemd_system_unitdir}/

recipes-support/arduino-ootb/arduino-ootb/ncm-network.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Configure link-local connection on usb ncm interface
+BindsTo=sys-subsystem-net-devices-usb0.device
+After=android-tools-adbd.service sys-subsystem-net-devices-usb0.device
+
+[Service]
+Type=simple
+RemainAfterExit=yes
+ExecStart=/bin/sh -c '/usr/bin/nmcli c delete usbncm; /usr/bin/nmcli c add type ethernet ifname usb0 ipv4.method shared ipv4.addresses 192.168.224.1/24 ipv6.method disabled con-name usbncm && /usr/bin/nmcli c up usbncm'
+ExecStop=/bin/sh -c '/usr/bin/nmcli c down usbncm && /usr/bin/nmcli c delete usbncm'
+
+[Install]
+WantedBy=usb-gadget.target