Compare commits

..

3 Commits

Author SHA1 Message Date
TIBERGHIEN corentin
16119c5725 gitignore 2026-02-17 15:09:48 +01:00
TIBERGHIEN corentin
2931340eee compile commands 2026-02-17 15:06:38 +01:00
rltbg
aa29c8b2a5 working usb negociation
networkmanager compatibility
2026-02-17 13:44:11 +01:00
7 changed files with 161 additions and 382 deletions

1
.gitignore vendored
View File

@@ -1 +0,0 @@
build

Binary file not shown.

View File

@@ -1,4 +1,4 @@
MODULE_NAME := ch397_driver MODULE_NAME := ch349_driver
obj-m := $(MODULE_NAME).o obj-m := $(MODULE_NAME).o
SRC_DIR := src SRC_DIR := src
@@ -6,7 +6,7 @@ BUILD_DIR := build
KDIR := /lib/modules/$(shell uname -r)/build KDIR := /lib/modules/$(shell uname -r)/build
$(MODULE_NAME)-objs := $(SRC_DIR)/ch397_driver.o $(MODULE_NAME)-objs := $(SRC_DIR)/ch349_driver.o
ccflags-y := -std=gnu11 -Wno-declaration-after-statement ccflags-y := -std=gnu11 -Wno-declaration-after-statement

View File

@@ -26,7 +26,7 @@ sudo update-initramfs -u
``` ```
En l'etat (5/2/26) le driver s'installe, s'attache au device ch397 puis creer une interface reseau sur la machine. on peut alors recuperer le nom de l'interface grace a : En l'etat (5/2/26) le driver s'installe, s'attache au device ch349 puis creer une interface reseau sur la machine. on peut alors recuperer le nom de l'interface grace a :
``` ```
ip a ip a
@@ -39,7 +39,7 @@ sudo ip addr add 192.168.1.100/24 dev <nom_interface>
sudo ip link set <nom_interface> up sudo ip link set <nom_interface> up
``` ```
ce qui nous permet ensuite, depuis une autre machine d'envoyer des pings a l'ip (192.168.1.100) qui sont ensuite parses en hexadecimal et affiches sur l'interface usb (visibles en executant dmesg | grep ch397) ce qui nous permet ensuite, depuis une autre machine d'envoyer des pings a l'ip (192.168.1.100) qui sont ensuite parses en hexadecimal et affiches sur l'interface usb (visibles en executant dmesg | grep ch349)
## Todo ## Todo

View File

@@ -1,307 +0,0 @@
[
{
"file": "src/ch349_driver.c",
"arguments": [
"gcc",
"-Wp,-MMD,src/.ch349_driver.o.d",
"-nostdinc",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/generated/uapi",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler-version.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/kconfig.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler_types.h",
"-D__KERNEL__",
"-std=gnu11",
"-fshort-wchar",
"-funsigned-char",
"-fno-common",
"-fno-PIE",
"-fno-strict-aliasing",
"-mno-sse",
"-mno-mmx",
"-mno-sse2",
"-mno-3dnow",
"-mno-avx",
"-mno-sse4a",
"-fcf-protection=branch",
"-fno-jump-tables",
"-m64",
"-falign-jumps=1",
"-falign-loops=1",
"-mno-80387",
"-mno-fp-ret-in-387",
"-mskip-rax-setup",
"-march=x86-64",
"-mtune=generic",
"-mno-red-zone",
"-mcmodel=kernel",
"-mstack-protector-guard-reg=gs",
"-mstack-protector-guard-symbol=__ref_stack_chk_guard",
"-Wno-sign-compare",
"-fno-asynchronous-unwind-tables",
"-mindirect-branch-cs-prefix",
"-mfunction-return=thunk-extern",
"-fno-jump-tables",
"-mharden-sls=all",
"-fpatchable-function-entry=16,16",
"-fno-delete-null-pointer-checks",
"-O2",
"-Wno-declaration-after-statement",
"-DMODULE",
"-DKBUILD_BASENAME=\"ch349_driver\"",
"-DKBUILD_MODNAME=\"ch349_driver\"",
"-D__KBUILD_MODNAME=kmod_ch349_driver",
"-c",
"-o",
"src/ch349_driver.o",
"src/ch349_driver.c"
],
"directory": "/home/bob/Projects/rj45toUSB_adapter/driver",
"output": "src/ch349_driver.o"
},
{
"file": "ch349_driver.mod.c",
"arguments": [
"gcc",
"-Wp,-MMD,./.ch349_driver.mod.o.d",
"-nostdinc",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/generated/uapi",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler-version.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/kconfig.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler_types.h",
"-D__KERNEL__",
"-std=gnu11",
"-fshort-wchar",
"-funsigned-char",
"-fno-common",
"-fno-PIE",
"-fno-strict-aliasing",
"-mno-sse",
"-mno-mmx",
"-mno-sse2",
"-mno-3dnow",
"-mno-avx",
"-mno-sse4a",
"-fcf-protection=branch",
"-fno-jump-tables",
"-m64",
"-falign-jumps=1",
"-falign-loops=1",
"-mno-80387",
"-mno-fp-ret-in-387",
"-mskip-rax-setup",
"-march=x86-64",
"-mtune=generic",
"-mno-red-zone",
"-mcmodel=kernel",
"-mstack-protector-guard-reg=gs",
"-mstack-protector-guard-symbol=__ref_stack_chk_guard",
"-Wno-sign-compare",
"-fno-asynchronous-unwind-tables",
"-mindirect-branch-cs-prefix",
"-mfunction-return=thunk-extern",
"-fno-jump-tables",
"-mharden-sls=all",
"-fpatchable-function-entry=16,16",
"-fno-delete-null-pointer-checks",
"-O2",
"-fstack-protector-strong",
"-fno-builtin-wcslen",
"-Wall",
"-Wextra",
"-Wundef",
"-Werror=implicit-function-declaration",
"-Werror=implicit-int",
"-Werror=return-type",
"-Werror=strict-prototypes",
"-Wno-format-security",
"-Wno-trigraphs",
"-Wno-frame-address",
"-Wno-address-of-packed-member",
"-Wmissing-declarations",
"-Wmissing-prototypes",
"-Wframe-larger-than=2048",
"-Wno-main",
"-Wno-dangling-pointer",
"-Wvla-larger-than=1",
"-Wno-pointer-sign",
"-Wcast-function-type",
"-Wno-unterminated-string-initialization",
"-Wno-array-bounds",
"-Wno-stringop-overflow",
"-Wno-alloc-size-larger-than",
"-Wimplicit-fallthrough=5",
"-Werror=date-time",
"-Werror=incompatible-pointer-types",
"-Werror=designated-init",
"-Wenum-conversion",
"-Wunused",
"-Wno-unused-but-set-variable",
"-Wno-unused-const-variable",
"-Wno-packed-not-aligned",
"-Wno-format-overflow",
"-Wno-format-truncation",
"-Wno-stringop-truncation",
"-Wno-override-init",
"-Wno-missing-field-initializers",
"-Wno-type-limits",
"-Wno-shift-negative-value",
"-Wno-maybe-uninitialized",
"-Wno-sign-compare",
"-Wno-unused-parameter",
"-g",
"-gdwarf-5",
"-DMODULE",
"-DKBUILD_BASENAME=\"ch349_driver.mod\"",
"-DKBUILD_MODNAME=\"ch349_driver\"",
"-D__KBUILD_MODNAME=kmod_ch349_driver",
"-c",
"-o",
"ch349_driver.mod.o",
"ch349_driver.mod.c"
],
"directory": "/home/bob/Projects/rj45toUSB_adapter/driver",
"output": "ch349_driver.mod.o"
},
{
"file": "/usr/lib/modules/6.18.7-arch1-1/build/scripts/module-common.c",
"arguments": [
"gcc",
"-Wp,-MMD,./..module-common.o.d",
"-nostdinc",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/arch/x86/include/generated/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/uapi",
"-I/usr/lib/modules/6.18.7-arch1-1/build/include/generated/uapi",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler-version.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/kconfig.h",
"-include",
"/usr/lib/modules/6.18.7-arch1-1/build/include/linux/compiler_types.h",
"-D__KERNEL__",
"-std=gnu11",
"-fshort-wchar",
"-funsigned-char",
"-fno-common",
"-fno-PIE",
"-fno-strict-aliasing",
"-mno-sse",
"-mno-mmx",
"-mno-sse2",
"-mno-3dnow",
"-mno-avx",
"-mno-sse4a",
"-fcf-protection=branch",
"-fno-jump-tables",
"-m64",
"-falign-jumps=1",
"-falign-loops=1",
"-mno-80387",
"-mno-fp-ret-in-387",
"-mskip-rax-setup",
"-march=x86-64",
"-mtune=generic",
"-mno-red-zone",
"-mcmodel=kernel",
"-mstack-protector-guard-reg=gs",
"-mstack-protector-guard-symbol=__ref_stack_chk_guard",
"-Wno-sign-compare",
"-fno-asynchronous-unwind-tables",
"-mindirect-branch-cs-prefix",
"-mfunction-return=thunk-extern",
"-fno-jump-tables",
"-mharden-sls=all",
"-fpatchable-function-entry=16,16",
"-fno-delete-null-pointer-checks",
"-O2",
"-fstack-protector-strong",
"-ftrivial-auto-var-init=zero",
"-fno-stack-clash-protection",
"-pg",
"-mfentry",
"-DCC_USING_FENTRY",
"-fstrict-flex-arrays=3",
"-fno-strict-overflow",
"-fno-stack-check",
"-fno-builtin-wcslen",
"-Wall",
"-Wextra",
"-Wundef",
"-Werror=implicit-function-declaration",
"-Werror=implicit-int",
"-Werror=return-type",
"-Werror=strict-prototypes",
"-Wno-format-security",
"-Wno-trigraphs",
"-Wno-frame-address",
"-Wno-address-of-packed-member",
"-Wmissing-declarations",
"-Wmissing-prototypes",
"-Wframe-larger-than=2048",
"-Wno-main",
"-Wno-dangling-pointer",
"-Wvla-larger-than=1",
"-Wno-pointer-sign",
"-Wcast-function-type",
"-Wno-unterminated-string-initialization",
"-Wno-array-bounds",
"-Wno-stringop-overflow",
"-Wno-alloc-size-larger-than",
"-Wimplicit-fallthrough=5",
"-Werror=date-time",
"-Werror=incompatible-pointer-types",
"-Werror=designated-init",
"-Wenum-conversion",
"-Wunused",
"-Wno-unused-but-set-variable",
"-Wno-unused-const-variable",
"-Wno-packed-not-aligned",
"-Wno-format-overflow",
"-Wno-format-truncation",
"-Wno-stringop-truncation",
"-Wno-override-init",
"-Wno-missing-field-initializers",
"-Wno-type-limits",
"-Wno-shift-negative-value",
"-Wno-maybe-uninitialized",
"-Wno-sign-compare",
"-Wno-unused-parameter",
"-g",
"-gdwarf-5",
"-DMODULE",
"-DKBUILD_BASENAME=\".module_common\"",
"-DKBUILD_MODNAME=\".module_common.o\"",
"-D__KBUILD_MODNAME=kmod_.module_common.o",
"-c",
"-o",
".module-common.o",
"/usr/lib/modules/6.18.7-arch1-1/build/scripts/module-common.c"
],
"directory": "/home/bob/Projects/rj45toUSB_adapter/driver",
"output": ".module-common.o"
}
]

View File

@@ -11,4 +11,4 @@ make -- compile
make clean -- clean make clean -- clean
make install -- build and load driver make install -- build and load driver
make uninstall -- deload driver make uninstall -- deload driver
make bear -- use bear to generate compile_commands.json to fix lsp errors (might need to manually tweak compile_commands.json to suppress some unsupported arguments errors) make bear -- use bear to generate compile_commands.json to fix lsp errors

View File

@@ -12,10 +12,10 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/usb.h> #include <linux/usb.h>
#define CH397_VENDOR_ID 0x1a86 #define CH349_VENDOR_ID 0x1a86
#define CH397_PRODUCT_ID 0x5397 #define CH349_PRODUCT_ID 0x5397
struct ch397_device { struct ch349_device {
struct usb_device *udev; struct usb_device *udev;
struct usb_interface *interface; struct usb_interface *interface;
struct mutex io_mutex; struct mutex io_mutex;
@@ -28,15 +28,14 @@ struct ch397_device {
struct net_device *netdev; struct net_device *netdev;
}; };
static const struct usb_device_id ch397_table[] = { static const struct usb_device_id ch349_table[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(CH397_VENDOR_ID, CH397_PRODUCT_ID, { USB_DEVICE(CH349_VENDOR_ID, CH349_PRODUCT_ID) },
USB_CLASS_CDC_DATA, 0, 0) },
{} {}
}; };
MODULE_DEVICE_TABLE(usb, ch397_table); MODULE_DEVICE_TABLE(usb, ch349_table);
// Fonction pour récupérer la MAC // Fonction pour récupérer la MAC
static int ch397_get_mac_address(struct ch397_device *dev, u8 *mac) static int ch349_get_mac_address(struct ch349_device *dev, u8 *mac)
{ {
char buf[13]; char buf[13];
int ret, i; int ret, i;
@@ -63,7 +62,7 @@ static int ch397_get_mac_address(struct ch397_device *dev, u8 *mac)
return 0; return 0;
} }
static void ch397_hexdump(const struct device *dev, const char *prefix, static void ch349_hexdump(const struct device *dev, const char *prefix,
const void *data, size_t len) const void *data, size_t len)
{ {
const unsigned char *buf = data; const unsigned char *buf = data;
@@ -94,21 +93,21 @@ static void ch397_hexdump(const struct device *dev, const char *prefix,
} }
} }
static void ch397_read_callback(struct urb *urb) static void ch349_read_callback(struct urb *urb)
{ {
struct ch397_device *dev = urb->context; struct ch349_device *dev = urb->context;
struct net_device *netdev = dev->netdev; struct net_device *netdev = dev->netdev;
struct sk_buff *skb; struct sk_buff *skb;
struct ethhdr *eth;
int status = urb->status; int status = urb->status;
switch (status) { switch (status) {
case 0: // Success! case 0: // Success!
if (urb->actual_length > 0) { if (urb->actual_length > 0) {
dev_info(&dev->interface->dev, dev_info(&dev->interface->dev,
"ch397: Received %d bytes\n", "ch349: Received %d bytes\n",
urb->actual_length); urb->actual_length);
ch397_hexdump(&dev->interface->dev, "RX", ch349_hexdump(&dev->interface->dev, "RX",
urb->transfer_buffer, urb->actual_length); urb->transfer_buffer, urb->actual_length);
// Créer un sk_buff et passer au network stack // Créer un sk_buff et passer au network stack
@@ -127,10 +126,10 @@ static void ch397_read_callback(struct urb *urb)
netdev->stats.rx_bytes += urb->actual_length; netdev->stats.rx_bytes += urb->actual_length;
printk(KERN_INFO printk(KERN_INFO
"ch397: Packet passed to network stack\n"); "ch349: Packet passed to network stack\n");
} else { } else {
netdev->stats.rx_dropped++; netdev->stats.rx_dropped++;
printk(KERN_ERR "ch397: Cannot allocate skb\n"); printk(KERN_ERR "ch349: Cannot allocate skb\n");
} }
} }
break; break;
@@ -156,7 +155,7 @@ static void ch397_read_callback(struct urb *urb)
} }
// Fonction pour démarrer la lecture // Fonction pour démarrer la lecture
static int ch397_start_rx(struct ch397_device *dev) static int ch349_start_rx(struct ch349_device *dev)
{ {
struct urb *urb; struct urb *urb;
int retval; int retval;
@@ -174,7 +173,7 @@ static int ch397_start_rx(struct ch397_device *dev)
usb_fill_bulk_urb(urb, dev->udev, usb_fill_bulk_urb(urb, dev->udev,
usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr),
dev->bulk_in_buffer, dev->bulk_in_size, dev->bulk_in_buffer, dev->bulk_in_size,
ch397_read_callback, dev); ch349_read_callback, dev);
// Sauvegarder l'URB dans la structure // Sauvegarder l'URB dans la structure
dev->rx_urb = urb; dev->rx_urb = urb;
@@ -194,7 +193,7 @@ static int ch397_start_rx(struct ch397_device *dev)
} }
// Fonction pour arrêter la lecture // Fonction pour arrêter la lecture
static void ch397_stop_rx(struct ch397_device *dev) static void ch349_stop_rx(struct ch349_device *dev)
{ {
if (dev->rx_urb) { if (dev->rx_urb) {
usb_kill_urb(dev->rx_urb); usb_kill_urb(dev->rx_urb);
@@ -203,64 +202,142 @@ static void ch397_stop_rx(struct ch397_device *dev)
} }
} }
static int ch397_net_open(struct net_device *netdev) static int ch349_net_open(struct net_device *netdev)
{ {
struct ch397_device *dev = netdev_priv(netdev); struct ch349_device *dev = netdev_priv(netdev);
int retval; int retval;
printk(KERN_INFO "ch397: Interface UP\n"); printk(KERN_INFO "ch349: Interface UP\n");
retval = ch397_start_rx(dev); retval = ch349_start_rx(dev);
if (retval) if (retval)
return retval; return retval;
netif_carrier_on(netdev);
netif_start_queue(netdev); netif_start_queue(netdev);
return 0; return 0;
} }
static int ch397_net_stop(struct net_device *netdev) static int ch349_net_stop(struct net_device *netdev)
{ {
struct ch397_device *dev = netdev_priv(netdev); struct ch349_device *dev = netdev_priv(netdev);
printk(KERN_INFO "ch397: Interface DOWN\n"); printk(KERN_INFO "ch349: Interface DOWN\n");
netif_stop_queue(netdev); netif_stop_queue(netdev);
ch397_stop_rx(dev); netif_carrier_off(netdev);
ch349_stop_rx(dev);
return 0; return 0;
} }
static netdev_tx_t ch397_start_xmit(struct sk_buff *skb, static void ch349_write_callback(struct urb *urb)
{
struct sk_buff *skb = urb->context;
struct net_device *netdev = skb->dev;
if (urb->status == 0) {
// Transmission réussie
netdev->stats.tx_packets++;
netdev->stats.tx_bytes += skb->len;
} else {
netdev->stats.tx_errors++;
}
// Libérer le skb et l'urb
dev_kfree_skb_any(skb);
usb_free_urb(urb);
}
static netdev_tx_t ch349_start_xmit(struct sk_buff *skb,
struct net_device *netdev) struct net_device *netdev)
{ {
// Pour l'instant, on drop juste les packets TX struct ch349_device *dev = netdev_priv(netdev);
struct urb *urb;
int retval;
// Allouer un URB pour l'envoi
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
netdev->stats.tx_dropped++; netdev->stats.tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static const struct net_device_ops ch397_netdev_ops = { // Préparer l'URB (Bulk OUT)
.ndo_open = ch397_net_open, usb_fill_bulk_urb(urb, dev->udev,
.ndo_stop = ch397_net_stop, usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr),
.ndo_start_xmit = ch397_start_xmit, skb->data, skb->len,
ch349_write_callback, skb);
// Soumettre l'URB
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) {
dev_err(&dev->interface->dev, "Failed to submit TX URB: %d\n", retval);
usb_free_urb(urb);
dev_kfree_skb(skb);
netdev->stats.tx_errors++;
} else {
// Arrêter la queue si on a trop d'URB en vol (simplification ici: on laisse couler)
// netif_stop_queue(netdev);
}
return NETDEV_TX_OK;
}
static const struct net_device_ops ch349_netdev_ops = {
.ndo_open = ch349_net_open,
.ndo_stop = ch349_net_stop,
.ndo_start_xmit = ch349_start_xmit,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
}; };
static int ch397_probe(struct usb_interface *interface,
static int ch349_probe(struct usb_interface *interface,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct ch397_device *dev; struct ch349_device *dev;
struct net_device *netdev; struct net_device *netdev;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
u8 mac[ETH_ALEN]; u8 mac[ETH_ALEN];
int i; int i;
int retval = -ENOMEM; int retval = 0;
struct usb_device *udev = interface_to_usbdev(interface);
int config_val = udev->actconfig->desc.bConfigurationValue;
int intf_num = interface->cur_altsetting->desc.bInterfaceNumber;
dev_info(&interface->dev, "Probing CH397 device\n");
dev_info(&interface->dev,
"Probing CH349 device (config %d, interface %d)\n",
config_val, intf_num);
/*
* This device exposes 3 USB configurations:
* Config 1: Vendor Specific - Interface 0 has bulk endpoints directly
* Config 2: CDC Ethernet - Interface 0 = CDC Comm (no bulk)
* Interface 1, Alt 1 = CDC Data (bulk endpoints)
* Config 3: CDC NCM
*
* We handle Config 1 and Config 2. In Config 2, we skip Interface 0
* (CDC Comm) and only claim Interface 1 (CDC Data) with Alt Setting 1.
*/
// Config 2: Skip Interface 0 (CDC Communications, no bulk endpoints)
if (config_val == 2 && intf_num == 0) {
dev_info(&interface->dev,
"Skipping CDC Comm interface (no bulk endpoints)\n");
return -ENODEV;
}
// Config 3: Not supported for now
if (config_val == 3) {
dev_info(&interface->dev, "Config 3 (NCM) not supported\n");
return -ENODEV;
}
// Allouer net_device + notre structure // Allouer net_device + notre structure
netdev = alloc_etherdev(sizeof(struct ch397_device)); netdev = alloc_etherdev(sizeof(struct ch349_device));
if (!netdev) { if (!netdev) {
dev_err(&interface->dev, "Cannot allocate netdev\n"); dev_err(&interface->dev, "Cannot allocate netdev\n");
return -ENOMEM; return -ENOMEM;
@@ -270,19 +347,25 @@ static int ch397_probe(struct usb_interface *interface,
dev->netdev = netdev; dev->netdev = netdev;
mutex_init(&dev->io_mutex); mutex_init(&dev->io_mutex);
dev->udev = usb_get_dev(interface_to_usbdev(interface)); dev->udev = usb_get_dev(udev);
dev->interface = interface; dev->interface = interface;
// Sélectionne l'altsetting 1 // In Config 2, Interface 1: switch to Alt Setting 1 to get bulk endpoints
retval = usb_set_interface( if (config_val == 2 && intf_num == 1) {
dev->udev, interface->cur_altsetting->desc.bInterfaceNumber, 1); retval = usb_set_interface(udev, intf_num, 1);
if (retval) { if (retval) {
dev_err(&interface->dev, "Cannot set altsetting 1: %d\n", dev_err(&interface->dev,
retval); "Cannot set altsetting 1: %d\n", retval);
goto error; goto error;
} }
dev_info(&interface->dev,
"Switched to altsetting 1 for CDC Data\n");
}
dev_info(&interface->dev, "Interface %d obtained (altsetting %d)\n",
intf_num,
interface->cur_altsetting->desc.bAlternateSetting);
dev_info(&interface->dev, "Interface obtained\n");
for (i = 0; i < interface->cur_altsetting->desc.bNumEndpoints; i++) { for (i = 0; i < interface->cur_altsetting->desc.bNumEndpoints; i++) {
endpoint = &interface->cur_altsetting->endpoint[i].desc; endpoint = &interface->cur_altsetting->endpoint[i].desc;
@@ -318,15 +401,16 @@ static int ch397_probe(struct usb_interface *interface,
if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) { if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) {
dev_err(&interface->dev, dev_err(&interface->dev,
"Could not find both bulk-in and bulk-out endpoints\n"); "Could not find both bulk-in and bulk-out endpoints\n");
retval = -ENODEV;
goto error; goto error;
} }
// Récupère la MAC // Récupère la MAC
ch397_get_mac_address(dev, mac); ch349_get_mac_address(dev, mac);
eth_hw_addr_set(netdev, mac); eth_hw_addr_set(netdev, mac);
// Configure net_device // Configure net_device
netdev->netdev_ops = &ch397_netdev_ops; netdev->netdev_ops = &ch349_netdev_ops;
netdev->watchdog_timeo = 5 * HZ; netdev->watchdog_timeo = 5 * HZ;
usb_set_intfdata(interface, dev); usb_set_intfdata(interface, dev);
@@ -339,9 +423,12 @@ static int ch397_probe(struct usb_interface *interface,
goto error; goto error;
} }
dev_info(&interface->dev, "CH397 attached as %s (MAC: %pM)\n", netif_carrier_off(netdev);
dev_info(&interface->dev, "CH349 attached as %s (MAC: %pM)\n",
netdev->name, mac); netdev->name, mac);
//retval = ch349_start_rx(dev);
//if (retval) //if (retval)
// goto error; // goto error;
@@ -357,9 +444,9 @@ error:
return retval; return retval;
} }
static void ch397_disconnect(struct usb_interface *interface) static void ch349_disconnect(struct usb_interface *interface)
{ {
struct ch397_device *dev; struct ch349_device *dev;
struct net_device *netdev; struct net_device *netdev;
dev = usb_get_intfdata(interface); dev = usb_get_intfdata(interface);
@@ -370,18 +457,18 @@ static void ch397_disconnect(struct usb_interface *interface)
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
unregister_netdev(netdev); unregister_netdev(netdev);
ch397_stop_rx(dev); ch349_stop_rx(dev);
kfree(dev->bulk_in_buffer); kfree(dev->bulk_in_buffer);
usb_put_dev(dev->udev); usb_put_dev(dev->udev);
free_netdev(netdev); free_netdev(netdev);
dev_info(&interface->dev, "CH397 device now disconnected\n"); dev_info(&interface->dev, "CH349 device now disconnected\n");
} }
static int ch397_suspend(struct usb_interface *intf, pm_message_t message) static int ch349_suspend(struct usb_interface *intf, pm_message_t message)
{ {
struct ch397_device *dev = usb_get_intfdata(intf); struct ch349_device *dev = usb_get_intfdata(intf);
if (!dev) if (!dev)
return 0; return 0;
@@ -392,9 +479,9 @@ static int ch397_suspend(struct usb_interface *intf, pm_message_t message)
return 0; return 0;
} }
static int ch397_resume(struct usb_interface *intf) static int ch349_resume(struct usb_interface *intf)
{ {
struct ch397_device *dev = usb_get_intfdata(intf); struct ch349_device *dev = usb_get_intfdata(intf);
if (!dev) if (!dev)
return 0; return 0;
@@ -402,18 +489,18 @@ static int ch397_resume(struct usb_interface *intf)
return 0; return 0;
} }
static struct usb_driver ch397_driver = { static struct usb_driver ch349_driver = {
.name = "ch397", .name = "ch349",
.probe = ch397_probe, .probe = ch349_probe,
.disconnect = ch397_disconnect, .disconnect = ch349_disconnect,
.suspend = ch397_suspend, .suspend = ch349_suspend,
.resume = ch397_resume, .resume = ch349_resume,
.id_table = ch397_table, .id_table = ch349_table,
.supports_autosuspend = 1, .supports_autosuspend = 1,
}; };
module_usb_driver(ch397_driver); module_usb_driver(ch349_driver);
MODULE_AUTHOR("bob industries"); MODULE_AUTHOR("bob industries");
MODULE_DESCRIPTION("Driver USB pour CH397A"); MODULE_DESCRIPTION("Driver USB pour CH349A");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");