From 72cd0d896c7c73c5379a869f9f52e74bd48ac17e Mon Sep 17 00:00:00 2001 From: Axel CHEMIN Date: Thu, 19 Nov 2020 21:57:08 +0100 Subject: [PATCH] (RĂ©)Ajout 4.1 bonus --- include/libusb_wrapper.h | 2 ++ src/libusb_wrapper.c | 12 +++++++++++- src/main.c | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/libusb_wrapper.h b/include/libusb_wrapper.h index d620f92..9ea1806 100644 --- a/include/libusb_wrapper.h +++ b/include/libusb_wrapper.h @@ -4,6 +4,7 @@ #include #include #include +#include void usbinit(libusb_context** context_ptr); @@ -12,6 +13,7 @@ void usbclose(libusb_context* context); ssize_t getListDevices(libusb_context* context, libusb_device***list_ptr); void displayDevices(libusb_context *context); +void displayDevicesMore(libusb_context *context); void displayDeviceEndpoints (); diff --git a/src/libusb_wrapper.c b/src/libusb_wrapper.c index d4572c7..643a30b 100644 --- a/src/libusb_wrapper.c +++ b/src/libusb_wrapper.c @@ -1,6 +1,7 @@ #include "libusb_wrapper.h" + void usbinit(libusb_context **context_ptr) { //libusb_context *context; int statusInit = libusb_init(context_ptr); @@ -95,7 +96,6 @@ void _displayOneDevice(libusb_device *device){ printf("Vendor ID 0x0%x\n", desc.idVendor); printf("Product ID 0x0%x\n", desc.idProduct); - //_printConfig(device); //Does it work ? //displayDeviceEndpoints(device); //Not really work on Axel@Alptop } @@ -103,6 +103,16 @@ void displayDevices(libusb_context *context) { _enumerateDevices(context, _displayOneDevice); } +void _displayOneDeviceMore(libusb_device *device){ + _displayOneDevice(device); + _printConfig(device); +} + +void displayDevicesMore(libusb_context *context) { + _enumerateDevices(context, _displayOneDeviceMore); +} + + //void getFirstDeviceFromID(vid, pid) diff --git a/src/main.c b/src/main.c index 446806f..dd6eb3b 100644 --- a/src/main.c +++ b/src/main.c @@ -14,6 +14,10 @@ int main(int argc, char *argv[]){ printf("\e[91mDemo 4.1\e[39m\n"); displayDevices(context); } + else if(strcmp(argv[1], "demo4.1plus") == 0) { //if 4.1 bonus + printf("\e[91mDemo 4.1\e[39m\n"); + displayDevicesMore(context); + } else if(strcmp(argv[1], "demo4.2") == 0){//if 4.2 printf("\e[91mDemo 4.2\e[39m\n"); -- libgit2 0.21.2