mirror of
https://github.com/fhgwright/SCSI2SD.git
synced 2025-02-23 20:28:56 +00:00
More v5.2 bug fixes
This commit is contained in:
parent
14ba62e8e3
commit
8becbd1827
@ -578,7 +578,7 @@ void scsiDiskPoll()
|
|||||||
// work with.
|
// work with.
|
||||||
int scsiBusy = 1;
|
int scsiBusy = 1;
|
||||||
int sdBusy = 1;
|
int sdBusy = 1;
|
||||||
while (scsiBusy && sdBusy)
|
while (scsiBusy && sdBusy && isSDDevice)
|
||||||
{
|
{
|
||||||
uint8_t intr = CyEnterCriticalSection();
|
uint8_t intr = CyEnterCriticalSection();
|
||||||
scsiBusy = scsiDMABusy();
|
scsiBusy = scsiDMABusy();
|
||||||
|
@ -123,7 +123,7 @@ static void spiFlash_earlyInit(S2S_Device* dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Don't require the host to send us a START STOP UNIT command
|
// Don't require the host to send us a START STOP UNIT command
|
||||||
spiFlash->dev.mediaState = MEDIA_STARTED;
|
spiFlash->dev.mediaState = MEDIA_STARTED | MEDIA_WP;
|
||||||
|
|
||||||
// DMA stuff
|
// DMA stuff
|
||||||
spiFlashDMATxChan =
|
spiFlashDMATxChan =
|
||||||
|
@ -345,16 +345,18 @@ typedef enum
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#define TargetConfig S2S_TargetCfg
|
||||||
|
#define BoardConfig S2S_BoardConfig
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
static_assert(
|
static_assert(
|
||||||
std::is_pod<TargetConfig>::value, "Misuse of TargetConfig struct"
|
std::is_pod<S2S_TargetCfg>::value, "Misuse of TargetConfig struct"
|
||||||
);
|
);
|
||||||
static_assert(
|
static_assert(
|
||||||
sizeof(TargetConfig) == 4096,
|
sizeof(S2S_TargetCfg) == 4096,
|
||||||
"TargetConfig struct size mismatch"
|
"TargetConfig struct size mismatch"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -82,6 +82,7 @@ ifeq ($(TARGET),Darwin)
|
|||||||
CC=clang -mmacosx-version-min=10.7
|
CC=clang -mmacosx-version-min=10.7
|
||||||
CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7
|
CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7
|
||||||
WX_CONFIG += --with-macosx-version-min=10.7
|
WX_CONFIG += --with-macosx-version-min=10.7
|
||||||
|
CPPFLAGS_WXBUILD += -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
|
||||||
BUILD := $(PWD)/build/mac
|
BUILD := $(PWD)/build/mac
|
||||||
all: $(BUILD)/scsi2sd-util.dmg
|
all: $(BUILD)/scsi2sd-util.dmg
|
||||||
|
|
||||||
@ -156,7 +157,7 @@ endif
|
|||||||
mkdir -p $(dir $@)
|
mkdir -p $(dir $@)
|
||||||
( \
|
( \
|
||||||
cd $(dir $@) && \
|
cd $(dir $@) && \
|
||||||
$(CURDIR)/wxWidgets/configure $(WX_CONFIG) CPPFLAGS="$(CPPFLAGS_ZLIB)" LDFLAGS="$(LDFLAGS_ZLIB)" && \
|
$(CURDIR)/wxWidgets/configure $(WX_CONFIG) CPPFLAGS="$(CPPFLAGS_ZLIB) $(CPPFLAGS_WXBUILD)" LDFLAGS="$(LDFLAGS_ZLIB)" && \
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
) && \
|
) && \
|
||||||
touch $@
|
touch $@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user