Merge branch 'xxxajk' of github.com:felis/USB_Host_Shield_2.0 into xxxajk

This commit is contained in:
Kristian Sloth Lauszus 2013-10-08 18:08:29 +02:00
commit 59d20a17c8

View file

@ -34,6 +34,9 @@
/* Set this to 1 if you are using a Black Widdow */ /* Set this to 1 if you are using a Black Widdow */
#define USE_UHS_BLACK_WIDDOW 0 #define USE_UHS_BLACK_WIDDOW 0
/* Set this to 1 if you are using xmem2 and expanded memory and multitasking */
#define USE_XMEM_SPI_LOCK 0
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MASS STORAGE // MASS STORAGE
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -66,4 +69,11 @@
#include <avr/io.h> #include <avr/io.h>
#endif #endif
#if USE_XMEM_SPI_LOCK
#include <xmem.h>
#else
#define XMEM_ACQUIRE_SPI() (void(0))
#define XMEM_RELEASE_SPI() (void(0))
#endif
#endif /* SETTINGS_H */ #endif /* SETTINGS_H */