Nettoyage du code, structure

achemin1
1 parent 3d1c6506
Showing 4 changed files with 62 additions and 11 deletions Show diff stats
Makefile
include/libusb_wrapper.h
src/GetUsbInfos.c -> src/libusb_wrapper.c
src/main.c
@@ -24,13 +24,12 @@ all : main demostep
  
  
  
-main :
-	echo "Here compile the main program"
+main : libusb_wrapper ${SRC}/main.c
+	gcc -o ${OBJ}/$@.o -c ${SRC}/$@.c -I ${INCLUDE} ${CLIBS} ${CFLAGS}
+	gcc -o ${BIN}/$@.out ${OBJ}/main.o ${OBJ}/libusb_wrapper.o ${CFLAGS} ${CLIBS}
  
 demostep : STEP4.1
  
-
-
 STEP4.1 : ${SRC}/GetUsbInfos.c bin
 	gcc -o ${BIN}/STEP4.1.out ${SRC}/GetUsbInfos.c ${CLIBS} ${CFLAGS}
  
@@ -40,6 +39,14 @@ STEP4.2 : ${SRC}/FourPointTwo.c bin
 STEP4.3 : ${SRC}/FourPointThree.c bin
 	gcc -o ${BIN}/STEP4.3.out ${SRC}/FourPointThree.c ${CLIBS} ${CFLAGS}
  
+
+libs: libusb_wrapper
+
+libusb_wrapper: obj ${SRC}/libusb_wrapper.c ${INCLUDE}/libusb_wrapper.h
+	gcc -o ${OBJ}/$@.o -c ${SRC}/$@.c -I ${INCLUDE} ${CLIBS} ${CFLAGS}
+
+
+
 obj :
 	@-mkdir ${OBJ}
  
@@ -0,0 +1,9 @@
+#include <libusb-1.0/libusb.h>
+
+void usbinit();
+
+void usbclose();
+
+void displayDevices();
+
+void displayDeviceEndpoints();
@@ -2,7 +2,24 @@
 #include <stdio.h>
 #include <stdlib.h>
  
-int main() {
+
+void usbinit(){
+	printf("Hello usbinit\n");
+}
+
+void usbclose(){
+	printf("Hello usbclose\n");
+}
+
+void displayDevices(){
+	printf("Hello list of device");
+}
+
+void displayDeviceEndpoints(){
+	printf("Hello endpoint\n");
+}
+
+/*int main() {
  
   // initiate the usb thing
  
@@ -12,7 +29,7 @@ int main() {
     perror("libusb_init");
     exit(-1);
   }
-  /* ... some code ... */
+  /* ... some code ...*//*
  
   // actually enumerates all the usb and gives some infos abot the usb things
  
@@ -62,7 +79,7 @@ int main() {
     if (statusConfig != 0) {
       perror("libusb_set_configuration"); /*exit(-1);*/
     /*   }
-     */
+     *//*
     int MAXLEN_DESCRIPTOR_STRING = 200;
     uint8_t desc_idx = 2;
     uint16_t langid = 16;
@@ -115,11 +132,11 @@ int main() {
     */
  
     /* ... some ... code */
-    libusb_close(handle);
-  }
+    /*libusb_close(handle);
+  }*/
  
-  libusb_free_device_list(list, 1);
+/*  libusb_free_device_list(list, 1);
  
   libusb_exit(context);
   return 0;
-}
+}*/
@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include "libusb_wrapper.h"
+
+int main(){
+	printf("Hello World :)\n");
+
+	usbinit();
+
+	//if 4.1
+	displayDevices();
+
+	//if 4.2
+	displayDeviceEndpoints();
+
+	usbclose();
+
+	return 0;
+}