Skip to content

usb-gadgets: use CDC-NCM instead of RNDIS #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Toxpox wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −31
Open

usb-gadgets: use CDC-NCM instead of RNDIS #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distro/overlays/minimal/usb-gadgets/etc/modules-load.d/gadgets.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usb_f_acm
usb_f_mass_storage
usb_f_rndis
usb_f_ncm
42 changes: 12 additions & 30 deletions distro/overlays/minimal/usb-gadgets/usr/local/bin/gem-usb-gadgets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ G_MULTI_DIR="/sys/kernel/config/usb_gadget/g_multi"

USB_VID="0x1d6b"
USB_PID="0x0104"
# Bumped from 0x0404 when the composite interface layout changed, so that hosts
# re-evaluate the device instead of reusing cached per-interface driver bindings.
USB_BCDDEVICE="0x0405"
# Bumped when the composite interface layout changed (RNDIS -> CDC-NCM), so
# that hosts re-evaluate the device instead of reusing cached per-interface
# driver bindings.
USB_BCDDEVICE="0x0406"
USB_BCDUSB="0x0200"

ETH_HOST_MAC_ADDR="02:12:34:56:78:9A"
Expand All @@ -29,29 +30,11 @@ function enable_usb_serial()

function enable_usb_ethernet()
{
mkdir -p functions/rndis.usb0
echo "$ETH_HOST_MAC_ADDR" > functions/rndis.usb0/host_addr
echo "$ETH_DEV_MAC_ADDR" > functions/rndis.usb0/dev_addr

echo EF > functions/rndis.usb0/class
echo 04 > functions/rndis.usb0/subclass
echo 01 > functions/rndis.usb0/protocol

echo 1 > os_desc/use
echo 0xCD > os_desc/b_vendor_code
echo MSFT100 > os_desc/qw_sign
echo "RNDIS" > functions/rndis.usb0/os_desc/interface.rndis/compatible_id
echo "5162001" > functions/rndis.usb0/os_desc/interface.rndis/sub_compatible_id

mkdir -p configs/c.1
ln -s configs/c.1 os_desc
mkdir -p functions/rndis.usb0/os_desc/interface.rndis/Icons
echo 2 > functions/rndis.usb0/os_desc/interface.rndis/Icons/type
echo "%SystemRoot%\\system32\\shell32.dll,-233" > functions/rndis.usb0/os_desc/interface.rndis/Icons/data
mkdir -p functions/rndis.usb0/os_desc/interface.rndis/Label
echo 1 > functions/rndis.usb0/os_desc/interface.rndis/Label/type
echo "Gemstone USB Ethernet" > functions/rndis.usb0/os_desc/interface.rndis/Label/data
ln -s functions/rndis.usb0 configs/c.1/
mkdir -p functions/ncm.usb0
echo "$ETH_HOST_MAC_ADDR" > functions/ncm.usb0/host_addr
echo "$ETH_DEV_MAC_ADDR" > functions/ncm.usb0/dev_addr

ln -s functions/ncm.usb0 configs/c.1/
}

function enable_mass_storage()
Expand Down Expand Up @@ -139,10 +122,9 @@ function run()

echo 500 > configs/c.1/MaxPower

# RNDIS must be linked first: the Windows RNDIS class driver expects the
# RNDIS control interface to be interface 0 and fails with Code 10
# otherwise. Matches the function order of the reference bb-usb-gadgets
# script this file is based on.
# NCM is a standards-based CDC function, so unlike RNDIS it does not
# require the network control interface to be interface 0. Ordering here
# only affects interface numbering, not host driver binding.
enable_usb_ethernet
enable_usb_serial
enable_mass_storage
Expand Down