Prepending 'shared' to files in shared folder to make more clear that these files should only be edited from the shared folder as they're copied into source folder at compile time. Any edits from source folder will get stopped, and committing shared files outside of shared folder is not desired.

host/source/inlprog.c

@@ -13,14 +13,10 @@
 #include "dbg.h"
 
 #include "usb_operations.h"
-#include "usb_commands.h"
 #include "write_operations.h"
 
-
+//TODO remove once commands removed from main
-// vendor requests also defined in firmware
+#include "shared_usb_commands.h"
-// TODO put in combined .h file for both host and fw
-//#define REQ_LED_ON  1
-//#define REQ_LED_OFF 2
 
 
 int main(int argc, char *argv[]) 

host/source/usb_operations.c

@@ -1,20 +1,5 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <libusb.h>
-
-//uncomment to DEBUG this file alone
-//#define DEBUG
-//"make debug" to get DEBUG msgs on entire program
-#include "dbg.h"
-
 #include "usb_operations.h"
 
-//USB timeout
-#define SEC_5 5000
-
 //control transfer request types
 //uint8_t libusb_control_setup::bmRequestType
 //Request type.

host/source/usb_operations.h

@@ -1,8 +1,19 @@
 #ifndef _usb_operations_h
 #define _usb_operations_h
 
-#include "usb_operations.h"
+#include <stdio.h>
-#include "usb_commands.h"
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+#include <libusb.h>
+
+//uncomment to DEBUG this file alone
+//#define DEBUG
+//"make debug" to get DEBUG msgs on entire program
+#include "dbg.h"
+
+#include "shared_usb_commands.h"
 
 //control transfer request types
 //uint8_t libusb_control_setup::bmRequestType

host/source/write_operations.c

@@ -1,18 +1,4 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <libusb.h>
-
-//uncomment to DEBUG this file alone
-#define DEBUG
-//"make debug" to get DEBUG msgs on entire program
-#include "dbg.h"
-
 #include "write_operations.h"
-#include "usb_operations.h"
-#include "usb_commands.h"
 
 #define SIZE_NES_HEADER 16
 #define SIZE_PRG_BANK 16384

host/source/write_operations.h

@@ -1,7 +1,21 @@
 #ifndef _write_operations_h
 #define _write_operations_h
 
-#include "write_operations.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+#include <libusb.h>
+
+#include "usb_operations.h"
+#include "shared_usb_commands.h"
+
+//uncomment to DEBUG this file alone
+#define DEBUG
+//"make debug" to get DEBUG msgs on entire program
+#include "dbg.h"
+
 
 int write_file( libusb_device_handle *usbhandle, char *filename, char *ines_mapper, char *board_config );
 

shared/shared_usb_commands.h

@@ -0,0 +1,7 @@
+#ifndef _shared_usb_commands_h
+#define _shared_usb_commands_h
+
+#define REQ_LED_ON  1
+#define REQ_LED_OFF 2
+
+#endif

shared/usb_commands.h

@@ -1,7 +0,0 @@
-#ifndef _usb_commands_h
-#define _usb_commands_h
-
-#define REQ_LED_ON  1
-#define REQ_LED_OFF 2
-
-#endif