From c8eb8a88f409e0a3d89ab86c5b04310a39125895 Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Wed, 6 Jan 2021 22:14:36 +1000 Subject: [PATCH] Fix up compilation issues --- software/SCSI2SD/src/cdrom.c | 2 +- software/SCSI2SD/src/config.c | 22 +++++++++--------- software/SCSI2SD/src/config.h | 6 ++--- software/SCSI2SD/src/disk.c | 7 +++--- software/SCSI2SD/src/geometry.c | 9 ++++--- software/SCSI2SD/src/geometry.h | 3 ++- software/SCSI2SD/src/inquiry.c | 6 ++--- software/SCSI2SD/src/main.c | 3 +-- software/SCSI2SD/src/mode.c | 6 ++--- software/SCSI2SD/src/scsi.c | 22 +++++++++--------- software/SCSI2SD/src/scsi.h | 1 + software/SCSI2SD/src/sd.c | 18 +++++++------- software/SCSI2SD/src/sd.h | 4 ++-- software/SCSI2SD/src/sense.h | 4 ++-- software/SCSI2SD/src/storedevice.c | 4 ++-- .../SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit | Bin 275822 -> 275822 bytes .../SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj | 14 +++++++++++ software/include/scsi2sd.h | 4 ++-- 18 files changed, 77 insertions(+), 58 deletions(-) diff --git a/software/SCSI2SD/src/cdrom.c b/software/SCSI2SD/src/cdrom.c index 7f93948..9b28326 100755 --- a/software/SCSI2SD/src/cdrom.c +++ b/software/SCSI2SD/src/cdrom.c @@ -162,7 +162,7 @@ static void doReadTOC(int MSF, uint8_t track, uint16_t allocationLength) memcpy(scsiDev.data, SimpleTOC, len); uint32_t capacity = getScsiCapacity( - scsoDev.target->device, + scsiDev.target->device, scsiDev.target->cfg->sdSectorStart, scsiDev.target->state.bytesPerSector, scsiDev.target->cfg->scsiSectors); diff --git a/software/SCSI2SD/src/config.c b/software/SCSI2SD/src/config.c index ada1a47..1a19dfb 100755 --- a/software/SCSI2SD/src/config.c +++ b/software/SCSI2SD/src/config.c @@ -63,7 +63,7 @@ static int usbInEpState; static int usbDebugEpState; static int usbReady; -static void initBoardConfig(BoardConfig* config) { +static void initBoardConfig(S2S_BoardConfig* config) { memcpy( config, ( @@ -71,7 +71,7 @@ static void initBoardConfig(BoardConfig* config) { (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) + (CY_FLASH_SIZEOF_ROW * SCSI_CONFIG_BOARD_ROW) ), - sizeof(BoardConfig)); + sizeof(S2S_BoardConfig)); if (memcmp(config->magic, "BCFG", 4)) { // Set a default from the deprecated flags, or 0 if @@ -83,7 +83,7 @@ static void initBoardConfig(BoardConfig* config) { } } -void configInit(BoardConfig* config) +void configInit(S2S_BoardConfig* config) { // The USB block will be powered by an internal 3.3V regulator. // The PSoC must be operating between 4.6V and 5V for the regulator @@ -93,7 +93,7 @@ void configInit(BoardConfig* config) usbReady = 0; // We don't know if host is connected yet. int invalid = 1; - uint8_t* rawConfig = getConfigByIndex(0); + uint8_t* rawConfig = (uint8_t*)getConfigByIndex(0); int i; for (i = 0; i < 64; ++i) { @@ -404,14 +404,14 @@ void configSave(int scsiId, uint16_t bytesPerSector) int cfgIdx; for (cfgIdx = 0; cfgIdx < MAX_SCSI_TARGETS; ++cfgIdx) { - const TargetConfig* tgt = getConfigByIndex(cfgIdx); + const S2S_TargetCfg* tgt = getConfigByIndex(cfgIdx); if ((tgt->scsiId & CONFIG_TARGET_ID_BITS) == scsiId) { // Save row to flash // We only save the first row of the configuration // this contains the parameters changeable by a MODE SELECT command uint8_t rowData[CYDEV_FLS_ROW_SIZE]; - TargetConfig* rowCfgData = (TargetConfig*)&rowData; + S2S_TargetCfg* rowCfgData = (S2S_TargetCfg*)&rowData; memcpy(rowCfgData, tgt, sizeof(rowData)); rowCfgData->bytesPerSector = bytesPerSector; @@ -426,12 +426,12 @@ void configSave(int scsiId, uint16_t bytesPerSector) } -const TargetConfig* getConfigByIndex(int i) +const S2S_TargetCfg* getConfigByIndex(int i) { if (i <= 3) { size_t row = SCSI_CONFIG_0_ROW + (i * SCSI_CONFIG_ROWS); - return (const TargetConfig*) + return (const S2S_TargetCfg*) ( CY_FLASH_BASE + (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) + @@ -439,7 +439,7 @@ const TargetConfig* getConfigByIndex(int i) ); } else { size_t row = SCSI_CONFIG_4_ROW + ((i-4) * SCSI_CONFIG_ROWS); - return (const TargetConfig*) + return (const S2S_TargetCfg*) ( CY_FLASH_BASE + (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) + @@ -448,12 +448,12 @@ const TargetConfig* getConfigByIndex(int i) } } -const TargetConfig* getConfigById(int scsiId) +const S2S_TargetCfg* getConfigById(int scsiId) { int i; for (i = 0; i < MAX_SCSI_TARGETS; ++i) { - const TargetConfig* tgt = getConfigByIndex(i); + const S2S_TargetCfg* tgt = getConfigByIndex(i); if ((tgt->scsiId & CONFIG_TARGET_ID_BITS) == scsiId) { return tgt; diff --git a/software/SCSI2SD/src/config.h b/software/SCSI2SD/src/config.h index 2c47a1e..42b0fc5 100755 --- a/software/SCSI2SD/src/config.h +++ b/software/SCSI2SD/src/config.h @@ -20,12 +20,12 @@ #include "device.h" #include "scsi2sd.h" -void configInit(BoardConfig* config); +void configInit(S2S_BoardConfig* config); void debugInit(void); void configPoll(void); void configSave(int scsiId, uint16_t byesPerSector); -const TargetConfig* getConfigByIndex(int index); -const TargetConfig* getConfigById(int scsiId); +const S2S_TargetCfg* getConfigByIndex(int index); +const S2S_TargetCfg* getConfigById(int scsiId); #endif diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c index b49923a..acae400 100755 --- a/software/SCSI2SD/src/disk.c +++ b/software/SCSI2SD/src/disk.c @@ -76,7 +76,7 @@ static void doFormatUnitHeader(void) { // Save the "MODE SELECT savable parameters" configSave( - scsiDev.target->targetId, + scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS, scsiDev.target->state.bytesPerSector); } @@ -108,7 +108,6 @@ static void doReadCapacity() uint32_t capacity = getScsiCapacity( scsiDev.target->device, - scsiDev.device, scsiDev.target->cfg->sdSectorStart, scsiDev.target->state.bytesPerSector, scsiDev.target->cfg->scsiSectors); @@ -172,7 +171,7 @@ static void doWrite(uint32 lba, uint32 blocks) } else if (unlikely(((uint64) lba) + blocks > getScsiCapacity( - scsiDev->device, + scsiDev.target->device, scsiDev.target->cfg->sdSectorStart, bytesPerSector, scsiDev.target->cfg->scsiSectors @@ -218,6 +217,7 @@ static void doRead(uint32 lba, uint32 blocks) } uint32_t capacity = getScsiCapacity( + scsiDev.target->device, scsiDev.target->cfg->sdSectorStart, scsiDev.target->state.bytesPerSector, scsiDev.target->cfg->scsiSectors); @@ -271,6 +271,7 @@ static void doSeek(uint32 lba) { if (lba >= getScsiCapacity( + scsiDev.target->device, scsiDev.target->cfg->sdSectorStart, scsiDev.target->state.bytesPerSector, scsiDev.target->cfg->scsiSectors) diff --git a/software/SCSI2SD/src/geometry.c b/software/SCSI2SD/src/geometry.c index c3c6bb7..7d4d4e6 100755 --- a/software/SCSI2SD/src/geometry.c +++ b/software/SCSI2SD/src/geometry.c @@ -21,19 +21,22 @@ #include uint32_t getScsiCapacity( + S2S_Device* device, uint32_t sdSectorStart, uint16_t bytesPerSector, uint32_t scsiSectors) { + uint32_t devCapacity = device->getCapacity(device); + uint32_t capacity = - (sdDev.capacity - sdSectorStart) / + (devCapacity - sdSectorStart) / SDSectorsPerSCSISector(bytesPerSector); - if (sdDev.capacity == 0) + if (devCapacity == 0) { capacity = 0; } - else if (sdSectorStart >= sdDev.capacity) + else if (sdSectorStart >= devCapacity) { capacity = 0; } diff --git a/software/SCSI2SD/src/geometry.h b/software/SCSI2SD/src/geometry.h index 76da6e1..26fda1a 100755 --- a/software/SCSI2SD/src/geometry.h +++ b/software/SCSI2SD/src/geometry.h @@ -21,7 +21,8 @@ #include "config.h" #include "storedevice.h" - +#include "sd.h" + typedef enum { ADDRESS_BLOCK = 0, diff --git a/software/SCSI2SD/src/inquiry.c b/software/SCSI2SD/src/inquiry.c index b51069d..e1778a4 100755 --- a/software/SCSI2SD/src/inquiry.c +++ b/software/SCSI2SD/src/inquiry.c @@ -91,7 +91,7 @@ static const uint8 AscImpOperatingDefinition[] = 'S','C','S','I','-','2' }; -static void useCustomVPD(const TargetConfig* cfg, int pageCode) +static void useCustomVPD(const S2S_TargetCfg* cfg, int pageCode) { int cfgIdx = 0; int found = 0; @@ -147,7 +147,7 @@ void scsiInquiry() } else { - const TargetConfig* config = scsiDev.target->cfg; + const S2S_TargetCfg* config = scsiDev.target->cfg; memcpy(scsiDev.data, StandardResponse, sizeof(StandardResponse)); scsiDev.data[1] = scsiDev.target->cfg->deviceTypeModifier; @@ -180,7 +180,7 @@ void scsiInquiry() { memcpy(scsiDev.data, UnitSerialNumber, sizeof(UnitSerialNumber)); scsiDev.dataLen = sizeof(UnitSerialNumber); - const TargetConfig* config = scsiDev.target->cfg; + const S2S_TargetCfg* config = scsiDev.target->cfg; memcpy(&scsiDev.data[4], config->serial, sizeof(config->serial)); scsiDev.phase = DATA_IN; } diff --git a/software/SCSI2SD/src/main.c b/software/SCSI2SD/src/main.c index f552923..0349c77 100755 --- a/software/SCSI2SD/src/main.c +++ b/software/SCSI2SD/src/main.c @@ -42,7 +42,6 @@ int main() configInit(&scsiDev.boardCfg); debugInit(); - scsiPhyConfig(); scsiInit(); @@ -99,7 +98,7 @@ int main() scsiDev.target && (scsiDev.target->device->mediaState & MEDIA_PRESENT)) { - scsiDev.target->device->pollMediaBusy(); + scsiDev.target->device->pollMediaBusy(scsiDev.target->device); } } return 0; diff --git a/software/SCSI2SD/src/mode.c b/software/SCSI2SD/src/mode.c index 5c2e4dc..0a5056d 100755 --- a/software/SCSI2SD/src/mode.c +++ b/software/SCSI2SD/src/mode.c @@ -241,7 +241,7 @@ static void pageIn(int pc, int dataIdx, const uint8* pageData, int pageLen) } } -static int useCustomPages(const TargetConfig* cfg, int pc, int pageCode, int* idx) +static int useCustomPages(const S2S_TargetCfg* cfg, int pc, int pageCode, int* idx) { int found = 0; int cfgIdx = 0; @@ -626,7 +626,7 @@ static void doModeSelect(void) scsiDev.target->state.bytesPerSector = bytesPerSector; if (bytesPerSector != scsiDev.target->cfg->bytesPerSector) { - configSave(scsiDev.target->targetId, bytesPerSector); + configSave(scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS, bytesPerSector); } } } @@ -659,7 +659,7 @@ static void doModeSelect(void) scsiDev.target->state.bytesPerSector = bytesPerSector; if (scsiDev.cdb[1] & 1) // SP Save Pages flag { - configSave(scsiDev.target->targetId, bytesPerSector); + configSave(scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS, bytesPerSector); } } break; diff --git a/software/SCSI2SD/src/scsi.c b/software/SCSI2SD/src/scsi.c index a4d59f0..f415a3c 100755 --- a/software/SCSI2SD/src/scsi.c +++ b/software/SCSI2SD/src/scsi.c @@ -319,7 +319,7 @@ static void process_Command() if ((scsiDev.lun > 0) && (scsiDev.boardCfg.flags & CONFIG_MAP_LUNS_TO_IDS)) { S2S_Target* lunTarget = s2s_DeviceFindByScsiId(scsiDev.lun); - if (lunTarget! = NULL) + if (lunTarget != NULL) { scsiDev.target = lunTarget; scsiDev.lun = 0; @@ -330,7 +330,7 @@ static void process_Command() control = scsiDev.cdb[scsiDev.cdbLen - 1]; scsiDev.cmdCount++; - const TargetConfig* cfg = scsiDev.target->cfg; + const S2S_TargetCfg* cfg = scsiDev.target->cfg; if (unlikely(scsiDev.resetFlag)) { @@ -663,7 +663,7 @@ static void process_SelectionPhase() int atnFlag = SCSI_ReadFilt(SCSI_Filt_ATN); S2S_Target* target = NULL; - for (int testIdx = 0; testtIndex < 8; ++testtIndex) + for (int testIdx = 0; testIdx < 8; ++testIdx) { target = s2s_DeviceFindByScsiId(1 << testIdx); if (target) @@ -725,7 +725,7 @@ static void process_SelectionPhase() // SCSI1/SASI initiators may not set their own ID. { int i; - uint8_t initiatorMask = mask ^ (1 << target->targetId); + uint8_t initiatorMask = mask ^ (1 << (target->cfg->scsiId & CONFIG_TARGET_ID_BITS)); scsiDev.initiatorId = -1; for (i = 0; i < 8; ++i) { @@ -1056,17 +1056,17 @@ void scsiInit() for (int devIdx = 0; devIdx < deviceCount; ++devIdx) { int targetCount; - S2S_Target* targets = devices[deviceIdx].getTargets(devices + deviceIdx, &targetCount); + S2S_Target* targets = allDevices[devIdx].getTargets(allDevices + devIdx, &targetCount); for (int i = 0; i < targetCount; ++i) { S2S_TargetState* state = &(targets[i].state); - scsiDev.targets[i].state.reservedId = -1; - scsiDev.targets[i].state.reserverId = -1; - scsiDev.targets[i].state.unitAttention = POWER_ON_RESET; - scsiDev.targets[i].state.sense.code = NO_SENSE; - scsiDev.targets[i].state.sense.asc = NO_ADDITIONAL_SENSE_INFORMATION; + state->reservedId = -1; + state->reserverId = -1; + state->unitAttention = POWER_ON_RESET; + state->sense.code = NO_SENSE; + state->sense.asc = NO_ADDITIONAL_SENSE_INFORMATION; state->bytesPerSector = targets[i].cfg->bytesPerSector; } @@ -1105,7 +1105,7 @@ int scsiReconnect() { // Arbitrate. ledOn(); - uint8_t scsiIdMask = 1 << scsiDev.target->targetId; + uint8_t scsiIdMask = 1 << (scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS); SCSI_Out_Bits_Write(scsiIdMask); SCSI_Out_Ctl_Write(1); // Write bits manually. SCSI_SetPin(SCSI_Out_BSY); diff --git a/software/SCSI2SD/src/scsi.h b/software/SCSI2SD/src/scsi.h index a259105..f353e58 100755 --- a/software/SCSI2SD/src/scsi.h +++ b/software/SCSI2SD/src/scsi.h @@ -76,6 +76,7 @@ typedef enum typedef struct { S2S_Target* target; + S2S_BoardConfig boardCfg; // Set to true (1) if the ATN flag was set, and we need to // enter the MESSAGE_OUT phase. diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c index 3014e70..a16ad50 100755 --- a/software/SCSI2SD/src/sd.c +++ b/software/SCSI2SD/src/sd.c @@ -35,7 +35,7 @@ static int sd_pollMediaChange(S2S_Device* dev); static void sd_pollMediaBusy(S2S_Device* dev); // Global -SdCard sdCard S2S_DMA_ALIGN = { +SdCard sdCard = { { sd_earlyInit, sd_getTargets, @@ -1003,14 +1003,14 @@ void sdCheckPresent() // LOGICAL_UNIT_NOT_READY_INITIALIZING_COMMAND_REQUIRED sense // code, even if they stopped it first with // START STOP UNIT command. - blockDev.state |= DISK_STARTED; + sdCard.dev.mediaState |= MEDIA_STARTED; if (!firstInit) { int i; for (i = 0; i < MAX_SCSI_TARGETS; ++i) { - scsiDev.targets[i].unitAttention = PARAMETERS_CHANGED; + sdCard.targets[i].state.unitAttention = PARAMETERS_CHANGED; } } firstInit = 0; @@ -1035,12 +1035,12 @@ static void sd_earlyInit(S2S_Device* dev) { SdCard* sdCardDevice = (SdCard*)dev; - for (int i = 0; i < MAX_TARGETS; ++i) + for (int i = 0; i < MAX_SCSI_TARGETS; ++i) { sdCardDevice->targets[i].device = dev; sdCardDevice->targets[i].cfg = getConfigByIndex(i); } - sdCardDevice->lastPollMediaTime = s2s_getTime_ms(); + sdCardDevice->lastPollMediaTime = getTime_ms(); // Don't require the host to send us a START STOP UNIT command sdCardDevice->dev.mediaState = MEDIA_STARTED; @@ -1050,7 +1050,7 @@ static void sd_earlyInit(S2S_Device* dev) static S2S_Target* sd_getTargets(S2S_Device* dev, int* count) { SdCard* sdCardDevice = (SdCard*)dev; - *count = MAX_TARGETS; + *count = MAX_SCSI_TARGETS; return sdCardDevice->targets; } @@ -1063,9 +1063,9 @@ static uint32_t sd_getCapacity(S2S_Device* dev) static int sd_pollMediaChange(S2S_Device* dev) { SdCard* sdCardDevice = (SdCard*)dev; - if (s2s_elapsedTime_ms(sdCardDevice->lastPollMediaTime) > 200) + if (elapsedTime_ms(sdCardDevice->lastPollMediaTime) > 200) { - sdCardDevice->lastPollMediaTime = s2s_getTime_ms(); + sdCardDevice->lastPollMediaTime = getTime_ms(); sdCheckPresent(); return 0; } @@ -1078,6 +1078,6 @@ static int sd_pollMediaChange(S2S_Device* dev) static void sd_pollMediaBusy(S2S_Device* dev) { SdCard* sdCardDevice = (SdCard*)dev; - sdCardDevice->lastPollMediaTime = s2s_getTime_ms(); + sdCardDevice->lastPollMediaTime = getTime_ms(); } diff --git a/software/SCSI2SD/src/sd.h b/software/SCSI2SD/src/sd.h index d6e2ec8..602f938 100755 --- a/software/SCSI2SD/src/sd.h +++ b/software/SCSI2SD/src/sd.h @@ -56,11 +56,11 @@ typedef struct { S2S_Device dev; - S2S_Target targets[MAX_TARGETS]; + S2S_Target targets[MAX_SCSI_TARGETS]; int version; // SDHC = version 2. int ccs; // Card Capacity Status. 1 = SDHC or SDXC - uint32 capacity; // in 512 byte blocks + uint32_t capacity; // in 512 byte blocks uint8_t csd[16]; // Unparsed CSD uint8_t cid[16]; // Unparsed CID diff --git a/software/SCSI2SD/src/sense.h b/software/SCSI2SD/src/sense.h index 7852868..e73631f 100755 --- a/software/SCSI2SD/src/sense.h +++ b/software/SCSI2SD/src/sense.h @@ -169,8 +169,8 @@ typedef enum typedef struct { - uint8 code; - uint16 asc; + uint8_t code; + uint16_t asc; } ScsiSense; #endif diff --git a/software/SCSI2SD/src/storedevice.c b/software/SCSI2SD/src/storedevice.c index 261f461..a6b0173 100644 --- a/software/SCSI2SD/src/storedevice.c +++ b/software/SCSI2SD/src/storedevice.c @@ -33,8 +33,8 @@ S2S_Target* s2s_DeviceFindByScsiId(int scsiId) { S2S_Target* target = targets + targetIdx; if (target && - (target->cfg->scsiId & S2S_CFG_TARGET_ENABLED) && - ((target->cfg->scsiId & S2S_CFG_TARGET_ID_BITS) == scsiId)) + (target->cfg->scsiId & CONFIG_TARGET_ENABLED) && + ((target->cfg->scsiId & CONFIG_TARGET_ID_BITS) == scsiId)) { return target; } diff --git a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit index c3ea79e5d1f5771107430e4c4fe8c43406c6db53..453a9b13a7820f0b30920a5fc503d52a8cf6423e 100644 GIT binary patch delta 391 zcmaF&O5oiq0lollW)=|!1_llWv2|)e8~MITvVa(qIi#L~8Jj;!onmB>019p1FEgK& zMHa+LQhLV>VTGu@fwEk*u0dtx46Z;~-%J%aA?l>;KS0z?=5say3pKkrx4Str0x{Ee zH)rOPEnv~@!Y7yu86nJ$lgyqhEDAsiw_iQW91_E#2x97Lu~aa#D1n$Oby<=bAxr^% z79S?CgQq7LvY0?vGYnZAAgnuvEY@I8OqVudu>c!CJ=}=J7{cl^V$p@L_8YP2Ls*}T zSj-?S9b=emtTBrrL~N2Viz$S48ZP_C7-q7C2~ZZ~?&*alKrxWBr>`|(u>?DH`YRKl NTR`rgu4&5R3IH{{b>jd4 delta 391 zcmaF&O5oiq0lollW)=|!1_lm>TWk6PH}ZXxWC1ZIb4Wb}Gd6#eI>pFx2Pm|8zs!7A zmd7AglF~b72rESG4V2}gbqy*jXK)3|`ev%Y2~j6y{{fvSg6^}x!ui~5r~<# zyE!wTYypdI7e2vU$OvI}oMiT7fiSP0We$m9c>=V1yRH^X1vAT25Obw2OEM#bDWK2d z!vuEl^aMi|69{XDA&Ucqb;pp!8tjSb(nc&6U^AzO8?hKeSbat;x)9cWBNlxK>yr_S z8HA-{43mvDW-)|_O)_RNg|JS;W&aq%OtvtA$rhRb#X!!UzSe}r671CJuS|e$0l9y= IrYVan06gZO#{d8T diff --git a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj index b52eef2..0735469 100644 --- a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj +++ b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj @@ -151,6 +151,13 @@ + + + + + + + @@ -322,6 +329,13 @@ + + + + + + + diff --git a/software/include/scsi2sd.h b/software/include/scsi2sd.h index e9e44e2..fe52e76 100755 --- a/software/include/scsi2sd.h +++ b/software/include/scsi2sd.h @@ -184,7 +184,7 @@ typedef struct __attribute__((packed)) uint8_t modePages[1024]; uint8_t vpd[1024]; uint8_t unused[1024]; // Total size is 4k. -} TargetConfig; +} S2S_TargetCfg; typedef struct __attribute__((packed)) { @@ -198,7 +198,7 @@ typedef struct __attribute__((packed)) uint8_t reserved[247]; // Pad out to 256 bytes -} BoardConfig; +} S2S_BoardConfig; typedef enum { -- 2.38.5