From: Michael McMaster Date: Fri, 30 Oct 2015 03:43:44 +0000 (+1000) Subject: Bug fixes galore! Added lots more settings, and moved them into another config tab X-Git-Tag: v6.0BETA1~4 X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=56f1d31703234e8cb4c57b6a6de90f6f564a3f42;p=SCSI2SD-V6.git Bug fixes galore! Added lots more settings, and moved them into another config tab - wxWidgets upgrade to 3.02 - PSoC Creator upgrade to 3.3 --- diff --git a/CHANGELOG b/CHANGELOG index 81b3bf83..ea5ccc8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,17 @@ 20150x0x 4.5 - Fix bug in SCSI MODE SENSE that returned the wrong mode type - Fixes CDROM emulation + - Added selection delay parameter. This should be set to 1ms for older + SCSI1 hardware, or 0ms for SCSI2 and Mac Plus. + - Upgraded to wxWidgets 3.0.2 + - Fixed stability/performance issue for sector sizes above 512 + - Fixed bug that prevented the dvice working after "ejecting" a drive + - Upgraded to Cypress PSoC Creator 3.3 + - Added experimental caching option. This provides a 2x speed up for + sequential single-sector writes. It is disabled by default. + - Disabled SCSI Disconnect support by default. There's now an option + in scsi2sd-util to enable it. It should be left off unless you have + a very good reason to enable it. 20150813 4.4 - Added configuration option to allow SCSI2 mode. This option is OFF by diff --git a/software/SCSI2SD/src/config.c b/software/SCSI2SD/src/config.c index 67083456..7b4ed82e 100755 --- a/software/SCSI2SD/src/config.c +++ b/software/SCSI2SD/src/config.c @@ -26,13 +26,14 @@ #include "scsi.h" #include "scsiPhy.h" #include "disk.h" +#include "trace.h" #include "../../include/scsi2sd.h" #include "../../include/hidpacket.h" #include -static const uint16_t FIRMWARE_VERSION = 0x0442; +static const uint16_t FIRMWARE_VERSION = 0x0450; // 1 flash row static const uint8_t DEFAULT_CONFIG[256] = @@ -64,7 +65,26 @@ static int usbInEpState; static int usbDebugEpState; static int usbReady; -void configInit() +static void initBoardConfig(BoardConfig* config) { + memcpy( + config, + ( + CY_FLASH_BASE + + (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) + + (CY_FLASH_SIZEOF_ROW * SCSI_CONFIG_BOARD_ROW) + ), + sizeof(BoardConfig)); + + if (memcmp(config->magic, "BCFG", 4)) { + // Set a default from the deprecated flags, or 0 if + // there is no initial config. + config->flags = getConfigByIndex(0)->flagsDEPRECATED; + + config->selectionDelay = 255; // auto + } +} + +void configInit(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 @@ -90,6 +110,8 @@ void configInit() CySetTemp(); CyWriteRowData(SCSI_CONFIG_ARRAY, SCSI_CONFIG_0_ROW, DEFAULT_CONFIG); } + + initBoardConfig(config); } static void @@ -123,7 +145,7 @@ writeFlashCommand(const uint8_t* cmd, size_t cmdSize) // Be very careful not to overwrite the bootloader or other // code if ((flashArray != SCSI_CONFIG_ARRAY) || - (flashRow < SCSI_CONFIG_0_ROW) || + (flashRow < SCSI_CONFIG_BOARD_ROW) || (flashRow >= SCSI_CONFIG_3_ROW + SCSI_CONFIG_ROWS)) { uint8_t response[] = { CONFIG_STATUS_ERR}; @@ -324,6 +346,7 @@ void debugPoll() hidBuffer[27] = scsiDev.lastSenseASC >> 8; hidBuffer[28] = scsiDev.lastSenseASC; hidBuffer[29] = scsiReadDBxPins(); + hidBuffer[30] = LastTrace; hidBuffer[58] = sdDev.capacity >> 24; hidBuffer[59] = sdDev.capacity >> 16; diff --git a/software/SCSI2SD/src/config.h b/software/SCSI2SD/src/config.h index c16767c7..2c47a1eb 100755 --- a/software/SCSI2SD/src/config.h +++ b/software/SCSI2SD/src/config.h @@ -20,7 +20,7 @@ #include "device.h" #include "scsi2sd.h" -void configInit(void); +void configInit(BoardConfig* config); void debugInit(void); void configPoll(void); void configSave(int scsiId, uint16_t byesPerSector); diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c index 7a599390..7055c34f 100755 --- a/software/SCSI2SD/src/disk.c +++ b/software/SCSI2SD/src/disk.c @@ -175,6 +175,8 @@ static void doWrite(uint32 lba, uint32 blocks) CyDelay(10); } + uint32_t bytesPerSector = scsiDev.target->liveCfg.bytesPerSector; + if (unlikely(blockDev.state & DISK_WP) || unlikely(scsiDev.target->cfg->deviceType == CONFIG_OPTICAL)) @@ -187,7 +189,7 @@ static void doWrite(uint32 lba, uint32 blocks) else if (unlikely(((uint64) lba) + blocks > getScsiCapacity( scsiDev.target->cfg->sdSectorStart, - scsiDev.target->liveCfg.bytesPerSector, + bytesPerSector, scsiDev.target->cfg->scsiSectors ) )) @@ -199,19 +201,25 @@ static void doWrite(uint32 lba, uint32 blocks) } else { - transfer.dir = TRANSFER_WRITE; transfer.lba = lba; transfer.blocks = blocks; transfer.currentBlock = 0; scsiDev.phase = DATA_OUT; - scsiDev.dataLen = scsiDev.target->liveCfg.bytesPerSector; - scsiDev.dataPtr = scsiDev.target->liveCfg.bytesPerSector; + scsiDev.dataLen = bytesPerSector; + scsiDev.dataPtr = bytesPerSector; // No need for single-block writes atm. Overhead of the // multi-block write is minimal. transfer.multiBlock = 1; - sdWriteMultiSectorPrep(); + + uint32_t sdLBA = + SCSISector2SD( + scsiDev.target->cfg->sdSectorStart, + bytesPerSector, + lba); + uint32_t sdBlocks = blocks * SDSectorsPerSCSISector(bytesPerSector); + sdWriteMultiSectorPrep(sdLBA, sdBlocks); } } @@ -237,14 +245,21 @@ static void doRead(uint32 lba, uint32 blocks) } else { - transfer.dir = TRANSFER_READ; transfer.lba = lba; transfer.blocks = blocks; transfer.currentBlock = 0; scsiDev.phase = DATA_IN; scsiDev.dataLen = 0; // No data yet - if ((blocks * SDSectorsPerSCSISector(scsiDev.target->liveCfg.bytesPerSector) == 1) || + uint32_t bytesPerSector = scsiDev.target->liveCfg.bytesPerSector; + uint32_t sdSectorPerSCSISector = SDSectorsPerSCSISector(bytesPerSector); + uint32_t sdSectors = + blocks * sdSectorPerSCSISector; + + if (( + (sdSectors == 1) && + !(scsiDev.boardCfg.flags & CONFIG_ENABLE_CACHE) + ) || unlikely(((uint64) lba) + blocks == capacity) ) { @@ -255,7 +270,14 @@ static void doRead(uint32 lba, uint32 blocks) else { transfer.multiBlock = 1; - sdReadMultiSectorPrep(); + + uint32_t sdLBA = + SCSISector2SD( + scsiDev.target->cfg->sdSectorStart, + bytesPerSector, + lba); + + sdReadMultiSectorPrep(sdLBA, sdSectors); } } } @@ -515,22 +537,22 @@ int scsiDiskCommand() void scsiDiskPoll() { + uint32_t bytesPerSector = scsiDev.target->liveCfg.bytesPerSector; + if (scsiDev.phase == DATA_IN && transfer.currentBlock != transfer.blocks) { scsiEnterPhase(DATA_IN); int totalSDSectors = - transfer.blocks * - SDSectorsPerSCSISector(scsiDev.target->liveCfg.bytesPerSector); + transfer.blocks * SDSectorsPerSCSISector(bytesPerSector); uint32_t sdLBA = SCSISector2SD( scsiDev.target->cfg->sdSectorStart, - scsiDev.target->liveCfg.bytesPerSector, + bytesPerSector, transfer.lba); - const int sdPerScsi = - SDSectorsPerSCSISector(scsiDev.target->liveCfg.bytesPerSector); + const int sdPerScsi = SDSectorsPerSCSISector(bytesPerSector); int buffers = sizeof(scsiDev.data) / SD_SECTOR_SIZE; int prep = 0; int i = 0; @@ -543,16 +565,18 @@ void scsiDiskPoll() // Wait for the next DMA interrupt. It's beneficial to halt the // processor to give the DMA controller more memory bandwidth to // work with. - // We're optimistically assuming a race condition won't occur - // between these checks and the interrupt handers. The 1ms - // systick timer interrupt saves us on the event of a race. - int scsiBusy = scsiDMABusy(); - int sdBusy = sdDMABusy(); + int scsiBusy = 1; + int sdBusy = 1; while (scsiBusy && sdBusy) { - __WFI(); + uint8_t intr = CyEnterCriticalSection(); scsiBusy = scsiDMABusy(); sdBusy = sdDMABusy(); + if (scsiBusy && sdBusy) + { + __WFI(); + } + CyExitCriticalSection(intr); } if (sdActive && !sdBusy && sdReadSectorDMAPoll()) @@ -591,7 +615,7 @@ void scsiDiskPoll() int dmaBytes = SD_SECTOR_SIZE; if ((i % sdPerScsi) == (sdPerScsi - 1)) { - dmaBytes = scsiDev.target->liveCfg.bytesPerSector % SD_SECTOR_SIZE; + dmaBytes = bytesPerSector % SD_SECTOR_SIZE; if (dmaBytes == 0) dmaBytes = SD_SECTOR_SIZE; } scsiWriteDMA(&scsiDev.data[SD_SECTOR_SIZE * (i % buffers)], dmaBytes); @@ -609,8 +633,7 @@ void scsiDiskPoll() { scsiEnterPhase(DATA_OUT); - const int sdPerScsi = - SDSectorsPerSCSISector(scsiDev.target->liveCfg.bytesPerSector); + const int sdPerScsi = SDSectorsPerSCSISector(bytesPerSector); int totalSDSectors = transfer.blocks * sdPerScsi; int buffers = sizeof(scsiDev.data) / SD_SECTOR_SIZE; int prep = 0; @@ -629,19 +652,21 @@ void scsiDiskPoll() // Wait for the next DMA interrupt. It's beneficial to halt the // processor to give the DMA controller more memory bandwidth to // work with. - // We're optimistically assuming a race condition won't occur - // between these checks and the interrupt handers. The 1ms - // systick timer interrupt saves us on the event of a race. - int scsiBusy = scsiDMABusy(); - int sdBusy = sdDMABusy(); + int scsiBusy = 1; + int sdBusy = 1; while (scsiBusy && sdBusy) { - __WFI(); + uint8_t intr = CyEnterCriticalSection(); scsiBusy = scsiDMABusy(); sdBusy = sdDMABusy(); + if (scsiBusy && sdBusy) + { + __WFI(); + } + CyExitCriticalSection(intr); } - if (sdActive && !sdBusy && sdWriteSectorDMAPoll(i == (totalSDSectors - 1))) + if (sdActive && !sdBusy && sdWriteSectorDMAPoll()) { sdActive = 0; i++; @@ -669,13 +694,14 @@ void scsiDiskPoll() int dmaBytes = SD_SECTOR_SIZE; if ((prep % sdPerScsi) == (sdPerScsi - 1)) { - dmaBytes = scsiDev.target->liveCfg.bytesPerSector % SD_SECTOR_SIZE; + dmaBytes = bytesPerSector % SD_SECTOR_SIZE; if (dmaBytes == 0) dmaBytes = SD_SECTOR_SIZE; } scsiReadDMA(&scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)], dmaBytes); scsiActive = 1; } else if ( + (scsiDev.boardCfg.flags & CONFIG_ENABLE_DISCONNECT) && (scsiActive == 0) && likely(!scsiDisconnected) && unlikely(scsiDev.discPriv) && @@ -761,7 +787,7 @@ void scsiDiskPoll() if (scsiDev.phase == DATA_OUT) { if (scsiDev.parityError && - (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) && + (scsiDev.boardCfg.flags & CONFIG_ENABLE_PARITY) && (scsiDev.compatMode >= COMPAT_SCSI2)) { scsiDev.target->sense.code = ABORTED_COMMAND; @@ -784,24 +810,19 @@ void scsiDiskReset() transfer.currentBlock = 0; // Cancel long running commands! - if (unlikely(transfer.inProgress == 1)) + if ( + ((scsiDev.boardCfg.flags & CONFIG_ENABLE_CACHE) == 0) || + (transfer.multiBlock == 0) + ) { - if (transfer.dir == TRANSFER_WRITE) - { - sdCompleteWrite(); - } - else - { - sdCompleteRead(); - } + sdCompleteTransfer(); } - transfer.inProgress = 0; + transfer.multiBlock = 0; } void scsiDiskInit() { - transfer.inProgress = 0; scsiDiskReset(); // Don't require the host to send us a START STOP UNIT command diff --git a/software/SCSI2SD/src/disk.h b/software/SCSI2SD/src/disk.h index b9367a4d..df197d77 100755 --- a/software/SCSI2SD/src/disk.h +++ b/software/SCSI2SD/src/disk.h @@ -38,9 +38,7 @@ typedef struct typedef struct { - int dir; int multiBlock; // True if we're using a multi-block SPI transfer. - int inProgress; // True if we need to call sdComplete{Read|Write} uint32 lba; uint32 blocks; diff --git a/software/SCSI2SD/src/main.c b/software/SCSI2SD/src/main.c index cb041c29..992f2861 100755 --- a/software/SCSI2SD/src/main.c +++ b/software/SCSI2SD/src/main.c @@ -26,9 +26,7 @@ #include "time.h" #include "trace.h" -const char* Notice = "Copyright (C) 2014 Michael McMaster "; - -uint8_t testData[512]; +const char* Notice = "Copyright (C) 2015 Michael McMaster "; int main() { @@ -43,16 +41,21 @@ int main() // Set interrupt handlers. scsiPhyInit(); - configInit(); + configInit(&scsiDev.boardCfg); debugInit(); scsiInit(); scsiDiskInit(); - uint32_t lastSDPoll = getTime_ms(); - sdPoll(); - + // Optional bootup delay + int delaySeconds = 0; + while (delaySeconds < scsiDev.boardCfg.startupDelay) { + CyDelay(1000); + ++delaySeconds; + } + uint32_t lastSDPoll = getTime_ms(); + sdCheckPresent(); while (1) @@ -62,22 +65,35 @@ int main() scsiPoll(); scsiDiskPoll(); configPoll(); + sdPoll(); if (unlikely(scsiDev.phase == BUS_FREE)) { if (unlikely(elapsedTime_ms(lastSDPoll) > 200)) { lastSDPoll = getTime_ms(); - sdPoll(); + sdCheckPresent(); } else { // Wait for our 1ms timer to save some power. // There's an interrupt on the SEL signal to ensure we respond - // quickly to any SCSI commands. - __WFI(); + // quickly to any SCSI commands. The selection abort time is + // only 250us, and new SCSI-3 controllers time-out very + // not long after that, so we need to ensure we wake up quickly. + uint8_t interruptState = CyEnterCriticalSection(); + if (!SCSI_ReadFilt(SCSI_Filt_SEL)) + { + __WFI(); // Will wake on interrupt, regardless of mask + } + CyExitCriticalSection(interruptState); } } + else if (scsiDev.phase >= 0) + { + // don't waste time scanning SD cards while we're doing disk IO + lastSDPoll = getTime_ms(); + } } return 0; } diff --git a/software/SCSI2SD/src/scsi.c b/software/SCSI2SD/src/scsi.c index 48b4c6d5..79d1e739 100755 --- a/software/SCSI2SD/src/scsi.c +++ b/software/SCSI2SD/src/scsi.c @@ -213,7 +213,7 @@ static void process_DataOut() scsiDev.dataPtr += len; if (scsiDev.parityError && - (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) && + (scsiDev.boardCfg.flags & CONFIG_ENABLE_PARITY) && (scsiDev.compatMode >= COMPAT_SCSI2)) { scsiDev.target->sense.code = ABORTED_COMMAND; @@ -274,7 +274,7 @@ static void process_Command() return; } else if (scsiDev.parityError && - (cfg->flags & CONFIG_ENABLE_PARITY) && + (scsiDev.boardCfg.flags & CONFIG_ENABLE_PARITY) && (scsiDev.compatMode >= COMPAT_SCSI2)) { scsiDev.target->sense.code = ABORTED_COMMAND; @@ -327,7 +327,7 @@ static void process_Command() // on receiving the unit attention response on boot, thus // triggering another unit attention condition. else if (scsiDev.target->unitAttention && - (cfg->flags & CONFIG_ENABLE_UNIT_ATTENTION)) + (scsiDev.boardCfg.flags & CONFIG_ENABLE_UNIT_ATTENTION)) { scsiDev.target->sense.code = UNIT_ATTENTION; scsiDev.target->sense.asc = scsiDev.target->unitAttention; @@ -520,14 +520,26 @@ static void enter_SelectionPhase() static void process_SelectionPhase() { - if (scsiDev.compatMode < COMPAT_SCSI2) + // Selection delays. + // Many SCSI1 samplers that use a 5380 chip need a delay of at least 1ms. + // The Mac Plus boot-time (ie. rom code) selection abort time + // is < 1ms and must have no delay (standard suggests 250ms abort time) + // Most newer SCSI2 hosts don't care either way. + if (scsiDev.boardCfg.selectionDelay == 255) // auto + { + if (scsiDev.compatMode < COMPAT_SCSI2) + { + CyDelay(1); + } + } + else if (scsiDev.boardCfg.selectionDelay != 0) { - // Required for some older SCSI1 devices using a 5380 chip. - CyDelay(1); + CyDelay(scsiDev.boardCfg.selectionDelay); } int sel = SCSI_ReadFilt(SCSI_Filt_SEL); int bsy = SCSI_ReadFilt(SCSI_Filt_BSY); + int io = SCSI_ReadPin(SCSI_In_IO); // Only read these pins AFTER SEL and BSY - we don't want to catch them // during a transition period. @@ -546,11 +558,23 @@ static void process_SelectionPhase() break; } } - if (!bsy && sel && + sel &= SCSI_ReadFilt(SCSI_Filt_SEL); + bsy |= SCSI_ReadFilt(SCSI_Filt_BSY); + io |= SCSI_ReadPin(SCSI_In_IO); + if (!bsy && !io && sel && target && - (goodParity || !(target->cfg->flags & CONFIG_ENABLE_PARITY) || !atnFlag) && + (goodParity || !(scsiDev.boardCfg.flags & CONFIG_ENABLE_PARITY) || !atnFlag) && likely(maskBitCount <= 2)) { + // We've been selected! + // Assert BSY - Selection success! + // must happen within 200us (Selection abort time) of seeing our + // ID + SEL. + // (Note: the initiator will be waiting the "Selection time-out delay" + // for our BSY response, which is actually a very generous 250ms) + SCSI_SetPin(SCSI_Out_BSY); + ledOn(); + scsiDev.target = target; // Do we enter MESSAGE OUT immediately ? SCSI 1 and 2 standards says @@ -558,6 +582,7 @@ static void process_SelectionPhase() // The initiator should assert ATN with SEL. scsiDev.atnFlag = atnFlag; + // Unit attention breaks many older SCSI hosts. Disable it completely // for SCSI-1 (and older) hosts, regardless of our configured setting. // Enable the compatability mode also as many SASI and SCSI1 @@ -567,7 +592,7 @@ static void process_SelectionPhase() target->unitAttention = 0; scsiDev.compatMode = COMPAT_SCSI1; } - else if (!(target->cfg->flags & CONFIG_ENABLE_SCSI2)) + else if (!(scsiDev.boardCfg.flags & CONFIG_ENABLE_SCSI2)) { scsiDev.compatMode = COMPAT_SCSI1; } @@ -576,25 +601,8 @@ static void process_SelectionPhase() scsiDev.compatMode = COMPAT_SCSI2; } - // We've been selected! - // Assert BSY - Selection success! - // must happen within 200us (Selection abort time) of seeing our - // ID + SEL. - // (Note: the initiator will be waiting the "Selection time-out delay" - // for our BSY response, which is actually a very generous 250ms) - SCSI_SetPin(SCSI_Out_BSY); - ledOn(); - scsiDev.selCount++; - // Wait until the end of the selection phase. - while (likely(!scsiDev.resetFlag)) - { - if (!SCSI_ReadFilt(SCSI_Filt_SEL)) - { - break; - } - } // Save our initiator now that we're no longer in a time-critical // section. @@ -613,6 +621,15 @@ static void process_SelectionPhase() } } + // Wait until the end of the selection phase. + while (likely(!scsiDev.resetFlag)) + { + if (!SCSI_ReadFilt(SCSI_Filt_SEL)) + { + break; + } + } + scsiDev.phase = COMMAND; } else if (!sel) @@ -631,7 +648,7 @@ static void process_MessageOut() scsiDev.msgCount++; if (scsiDev.parityError && - (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) && + (scsiDev.boardCfg.flags & CONFIG_ENABLE_PARITY) && (scsiDev.compatMode >= COMPAT_SCSI2)) { // Skip the remaining message bytes, and then start the MESSAGE_OUT @@ -720,6 +737,12 @@ static void process_MessageOut() { // Two byte message. We don't support these. read and discard. scsiReadByte(); + + if (scsiDev.msgOut == 0x23) { + // Ignore Wide Residue. We're only 8 bit anyway. + } else { + messageReject(); + } } else if (scsiDev.msgOut == 0x01) { diff --git a/software/SCSI2SD/src/scsi.h b/software/SCSI2SD/src/scsi.h index adb61c80..11fd6764 100755 --- a/software/SCSI2SD/src/scsi.h +++ b/software/SCSI2SD/src/scsi.h @@ -97,10 +97,12 @@ typedef struct { TargetState targets[MAX_SCSI_TARGETS]; TargetState* target; + BoardConfig boardCfg; + // Set to true (1) if the ATN flag was set, and we need to // enter the MESSAGE_OUT phase. - volatile int atnFlag; + int atnFlag; // Set to true (1) if the RST flag was set. volatile int resetFlag; diff --git a/software/SCSI2SD/src/scsiPhy.c b/software/SCSI2SD/src/scsiPhy.c index da86b2b1..b3b466f4 100755 --- a/software/SCSI2SD/src/scsiPhy.c +++ b/software/SCSI2SD/src/scsiPhy.c @@ -75,7 +75,7 @@ CY_ISR(scsiSelectionISR) { // The SEL signal ISR ensures we wake up from a _WFI() (wait-for-interrupt) // call in the main loop without waiting for our 1ms timer to - // expire. This is done for performance reasons only. + // expire. This is done to meet the 250us selection abort time. } uint8_t @@ -104,9 +104,6 @@ scsiReadByte(void) uint8_t val = scsiPhyRx(); scsiDev.parityError = scsiDev.parityError || SCSI_Parity_Error_Read(); - trace(trace_spinTxComplete); - while (!(scsiPhyStatus() & SCSI_PHY_TX_COMPLETE) && likely(!scsiDev.resetFlag)) {} - return val; } @@ -132,7 +129,6 @@ scsiReadPIO(uint8* data, uint32 count) } } scsiDev.parityError = scsiDev.parityError || SCSI_Parity_Error_Read(); - while (!(scsiPhyStatus() & SCSI_PHY_TX_COMPLETE) && likely(!scsiDev.resetFlag)) {} } static void @@ -199,11 +195,6 @@ scsiReadDMAPoll() { if (scsiTxDMAComplete && scsiRxDMAComplete) { - // Wait until our scsi signals are consistent. This should only be - // a few cycles. - trace(trace_spinTxComplete); - while (!(scsiPhyStatus() & SCSI_PHY_TX_COMPLETE)) {} - if (likely(dmaSentCount == dmaTotalCount)) { dmaInProgress = 0; @@ -266,7 +257,7 @@ scsiWriteByte(uint8 value) trace(trace_spinTxComplete); while (!(scsiPhyStatus() & SCSI_PHY_TX_COMPLETE) && likely(!scsiDev.resetFlag)) {} - scsiPhyRxFifoClear(); + scsiPhyRx(); } static void @@ -386,7 +377,7 @@ scsiWrite(const uint8_t* data, uint32_t count) { __WFI(); }; - + if (count > alignedCount) { scsiWritePIO(data + alignedCount, count - alignedCount); @@ -403,6 +394,12 @@ static inline void busSettleDelay(void) void scsiEnterPhase(int phase) { + // ANSI INCITS 362-2002 SPI-3 10.7.1: + // Phase changes are not allowed while REQ or ACK is asserted. + while (likely(!scsiDev.resetFlag) && + (SCSI_ReadPin(SCSI_In_REQ) || SCSI_ReadFilt(SCSI_Filt_ACK)) + ) {} + int newPhase = phase > 0 ? phase : 0; if (newPhase != SCSI_CTL_PHASE_Read()) { @@ -427,7 +424,7 @@ void scsiPhyReset() dmaTotalCount = 0; CyDmaChSetRequest(scsiDmaTxChan, CY_DMA_CPU_TERM_CHAIN); CyDmaChSetRequest(scsiDmaRxChan, CY_DMA_CPU_TERM_CHAIN); - + // CyDmaChGetRequest returns 0 for the relevant bit once the // request is completed. trace(trace_spinDMAReset); @@ -484,7 +481,7 @@ static void scsiPhyInitDMA() HI16(CYDEV_SRAM_BASE), HI16(CYDEV_PERIPH_BASE) ); - + CyDmaChDisable(scsiDmaRxChan); CyDmaChDisable(scsiDmaTxChan); @@ -506,7 +503,7 @@ void scsiPhyInit() SCSI_SEL_ISR_StartEx(scsiSelectionISR); // Disable the glitch filter for ACK to improve performance. - if (getConfigByIndex(0)->flags & CONFIG_DISABLE_GLITCH) + if (scsiDev.boardCfg.flags & CONFIG_DISABLE_GLITCH) { SCSI_Glitch_Ctl_Write(1); CY_SET_REG8(scsiTarget_datapath__D0_REG, 0); diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c index e11e8b63..bf1adc23 100755 --- a/software/SCSI2SD/src/sd.c +++ b/software/SCSI2SD/src/sd.c @@ -33,7 +33,13 @@ // Global SdDevice sdDev; -enum SD_IO_STATE { SD_DMA, SD_ACCEPTED, SD_BUSY, SD_IDLE }; +enum SD_CMD_STATE { CMD_STATE_IDLE, CMD_STATE_READ, CMD_STATE_WRITE }; +static int sdCmdState = CMD_STATE_IDLE; +static uint32_t sdCmdNextLBA; // Only valid in CMD_STATE_READ or CMD_STATE_WRITE +static uint32_t sdCmdTime; +static uint32_t sdLastCmdState = CMD_STATE_IDLE; + +enum SD_IO_STATE { SD_DMA, SD_ACCEPTED, SD_IDLE }; static int sdIOState = SD_IDLE; // Private DMA variables. @@ -85,6 +91,7 @@ static uint8 sdCrc7(uint8* chr, uint8 cnt, uint8 crc) return crc & 0x7F; } + // Read and write 1 byte. static uint8_t sdSpiByte(uint8_t value) { @@ -95,6 +102,34 @@ static uint8_t sdSpiByte(uint8_t value) return SDCard_ReadRxData(); } +static void sdWaitWriteBusy() +{ + uint8 val; + do + { + val = sdSpiByte(0xFF); + } while (val != 0xFF); +} + +static void sdPreCmdState(uint32_t newState) +{ + if (sdCmdState == CMD_STATE_READ) + { + sdCompleteRead(); + } + else if (sdCmdState == CMD_STATE_WRITE) + { + sdCompleteWrite(); + } + sdCmdState = CMD_STATE_IDLE; + + if (sdLastCmdState != newState && newState != CMD_STATE_IDLE) + { + sdWaitWriteBusy(); + sdLastCmdState = newState; + } +} + static uint16_t sdDoCommand( uint8_t cmd, uint32_t param, @@ -172,7 +207,17 @@ static uint16_t sdDoCommand( CyDmaChEnable(sdDMATxChan, 1); trace(trace_spinSDDMA); - while (!(sdTxDMAComplete && sdRxDMAComplete)) { __WFI(); } + int allComplete = 0; + while (!allComplete) + { + uint8_t intr = CyEnterCriticalSection(); + allComplete = sdTxDMAComplete && sdRxDMAComplete; + if (!allComplete) + { + __WFI(); + } + CyExitCriticalSection(intr); + } uint16_t response = sdSpiByte(0xFF); // Result code or stuff byte if (unlikely(cmd == SD_STOP_TRANSMISSION)) @@ -218,34 +263,43 @@ static void sdClearStatus() } void -sdReadMultiSectorPrep() +sdReadMultiSectorPrep(uint32_t sdLBA, uint32_t sdSectors) { - uint8 v; - uint32 scsiLBA = (transfer.lba + transfer.currentBlock); - uint32 sdLBA = - SCSISector2SD( - scsiDev.target->cfg->sdSectorStart, - scsiDev.target->liveCfg.bytesPerSector, - scsiLBA); + uint32_t tmpNextLBA = sdLBA + sdSectors; if (!sdDev.ccs) { sdLBA = sdLBA * SD_SECTOR_SIZE; + tmpNextLBA = tmpNextLBA * SD_SECTOR_SIZE; } - v = sdCommandAndResponse(SD_READ_MULTIPLE_BLOCK, sdLBA); - if (unlikely(v)) - { - scsiDiskReset(); - sdClearStatus(); - scsiDev.status = CHECK_CONDITION; - scsiDev.target->sense.code = HARDWARE_ERROR; - scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE; - scsiDev.phase = STATUS; + if (sdCmdState == CMD_STATE_READ && sdCmdNextLBA == sdLBA) + { + // Well, that was lucky. We're already reading this data + sdCmdNextLBA = tmpNextLBA; + sdCmdTime = getTime_ms(); } else { - transfer.inProgress = 1; + sdPreCmdState(CMD_STATE_READ); + + uint8_t v = sdCommandAndResponse(SD_READ_MULTIPLE_BLOCK, sdLBA); + if (unlikely(v)) + { + scsiDiskReset(); + sdClearStatus(); + + scsiDev.status = CHECK_CONDITION; + scsiDev.target->sense.code = HARDWARE_ERROR; + scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE; + scsiDev.phase = STATUS; + } + else + { + sdCmdNextLBA = tmpNextLBA; + sdCmdState = CMD_STATE_READ; + sdCmdTime = getTime_ms(); + } } } @@ -290,12 +344,12 @@ dmaReadSector(uint8_t* outputBuffer) dmaRxTd[0] = CyDmaTdAllocate(); dmaRxTd[1] = CyDmaTdAllocate(); dmaTxTd = CyDmaTdAllocate(); - + // Receive 512 bytes of data and then 2 bytes CRC. CyDmaTdSetConfiguration(dmaRxTd[0], SD_SECTOR_SIZE, dmaRxTd[1], TD_INC_DST_ADR); CyDmaTdSetConfiguration(dmaRxTd[1], 2, CY_DMA_DISABLE_TD, SD_RX_DMA__TD_TERMOUT_EN); CyDmaTdSetAddress(dmaRxTd[1], LO16((uint32)SDCard_RXDATA_PTR), LO16((uint32)&discardBuffer)); - + CyDmaTdSetConfiguration(dmaTxTd, SD_SECTOR_SIZE + 2, CY_DMA_DISABLE_TD, SD_TX_DMA__TD_TERMOUT_EN); CyDmaTdSetAddress(dmaTxTd, LO16((uint32)&dummyBuffer), LO16((uint32)SDCard_TXDATA_PTR)); @@ -341,6 +395,8 @@ sdReadSectorDMAPoll() void sdReadSingleSectorDMA(uint32_t lba, uint8_t* outputBuffer) { + sdPreCmdState(CMD_STATE_READ); + uint8 v; if (!sdDev.ccs) { @@ -370,7 +426,6 @@ sdReadMultiSectorDMA(uint8_t* outputBuffer) dmaReadSector(outputBuffer); } - void sdCompleteRead() { if (unlikely(sdIOState != SD_IDLE)) @@ -381,13 +436,13 @@ void sdCompleteRead() trace(trace_spinSDCompleteRead); while (!sdReadSectorDMAPoll()) { /* spin */ } } - - if (transfer.inProgress) + + + if (sdCmdState == CMD_STATE_READ) { - transfer.inProgress = 0; uint8 r1b = sdCommandAndResponse(SD_STOP_TRANSMISSION, 0); - if (unlikely(r1b)) + if (unlikely(r1b) && (scsiDev.PHASE == DATA_IN)) { scsiDev.status = CHECK_CONDITION; scsiDev.target->sense.code = HARDWARE_ERROR; @@ -399,15 +454,8 @@ void sdCompleteRead() // R1b has an optional trailing "busy" signal, but we defer waiting on this. // The next call so sdCommandAndResponse will wait for the busy state to // clear. -} -static void sdWaitWriteBusy() -{ - uint8 val; - do - { - val = sdSpiByte(0xFF); - } while (val != 0xFF); + sdCmdState = CMD_STATE_IDLE; } void @@ -422,7 +470,7 @@ sdWriteMultiSectorDMA(uint8_t* outputBuffer) dmaTxTd[0] = CyDmaTdAllocate(); dmaTxTd[1] = CyDmaTdAllocate(); dmaTxTd[2] = CyDmaTdAllocate(); - + // Transmit 512 bytes of data and then 2 bytes CRC, and then get the response byte // We need to do this without stopping the clock CyDmaTdSetConfiguration(dmaTxTd[0], 2, dmaTxTd[1], TD_INC_SRC_ADR); @@ -464,7 +512,7 @@ sdWriteMultiSectorDMA(uint8_t* outputBuffer) } int -sdWriteSectorDMAPoll(int sendStopToken) +sdWriteSectorDMAPoll() { if (sdRxDMAComplete && sdTxDMAComplete) { @@ -490,7 +538,7 @@ sdWriteSectorDMAPoll(int sendStopToken) sdSpiByte(0xFD); // STOP TOKEN sdWaitWriteBusy(); - transfer.inProgress = 0; + sdCmdState = CMD_STATE_IDLE; scsiDiskReset(); sdClearStatus(); @@ -506,25 +554,6 @@ sdWriteSectorDMAPoll(int sendStopToken) } if (sdIOState == SD_ACCEPTED) - { - // Wait while the SD card is busy - if (sdSpiByte(0xFF) == 0xFF) - { - if (sendStopToken) - { - sdIOState = SD_BUSY; - transfer.inProgress = 0; - - sdSpiByte(0xFD); // STOP TOKEN - } - else - { - sdIOState = SD_IDLE; - } - } - } - - if (sdIOState == SD_BUSY) { // Wait while the SD card is busy if (sdSpiByte(0xFF) == 0xFF) @@ -549,10 +578,20 @@ void sdCompleteWrite() // Cancelling the transfer can't be done as we have no way to reset // the SD card. trace(trace_spinSDCompleteWrite); - while (!sdWriteSectorDMAPoll(1)) { /* spin */ } + while (!sdWriteSectorDMAPoll()) { /* spin */ } } - if (transfer.inProgress && likely(scsiDev.phase == DATA_OUT)) + if (sdCmdState == CMD_STATE_WRITE) + { + sdWaitWriteBusy(); + + sdSpiByte(0xFD); // STOP TOKEN + + sdWaitWriteBusy(); + } + + + if (likely(scsiDev.phase == DATA_OUT)) { uint16_t r2 = sdDoCommand(SD_SEND_STATUS, 0, 0, 1); if (unlikely(r2)) @@ -564,7 +603,12 @@ void sdCompleteWrite() scsiDev.phase = STATUS; } } - transfer.inProgress = 0; + sdCmdState = CMD_STATE_IDLE; +} + +void sdCompleteTransfer() +{ + sdPreCmdState(CMD_STATE_IDLE); } @@ -763,6 +807,7 @@ int sdInit() int i; uint8 v; + sdCmdState = CMD_STATE_IDLE; sdDev.version = 0; sdDev.ccs = 0; sdDev.capacity = 0; @@ -845,52 +890,68 @@ out: } -void sdWriteMultiSectorPrep() +void sdWriteMultiSectorPrep(uint32_t sdLBA, uint32_t sdSectors) { - uint8 v; + uint32_t tmpNextLBA = sdLBA + sdSectors; - // Set the number of blocks to pre-erase by the multiple block write command - // We don't care about the response - if the command is not accepted, writes - // will just be a bit slower. - // Max 22bit parameter. - uint32_t sdBlocks = - transfer.blocks * - SDSectorsPerSCSISector(scsiDev.target->liveCfg.bytesPerSector); - uint32 blocks = sdBlocks > 0x7FFFFF ? 0x7FFFFF : sdBlocks; - sdCommandAndResponse(SD_APP_CMD, 0); - sdCommandAndResponse(SD_APP_SET_WR_BLK_ERASE_COUNT, blocks); - - uint32 scsiLBA = (transfer.lba + transfer.currentBlock); - uint32 sdLBA = - SCSISector2SD( - scsiDev.target->cfg->sdSectorStart, - scsiDev.target->liveCfg.bytesPerSector, - scsiLBA); if (!sdDev.ccs) { sdLBA = sdLBA * SD_SECTOR_SIZE; + tmpNextLBA = tmpNextLBA * SD_SECTOR_SIZE; } - v = sdCommandAndResponse(SD_WRITE_MULTIPLE_BLOCK, sdLBA); - if (unlikely(v)) + + if (sdCmdState == CMD_STATE_WRITE && sdCmdNextLBA == sdLBA) { - scsiDiskReset(); - sdClearStatus(); - scsiDev.status = CHECK_CONDITION; - scsiDev.target->sense.code = HARDWARE_ERROR; - scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE; - scsiDev.phase = STATUS; + // Well, that was lucky. We're already writing this data + sdCmdNextLBA = tmpNextLBA; + sdCmdTime = getTime_ms(); } else { - transfer.inProgress = 1; + sdPreCmdState(CMD_STATE_WRITE); + + // Set the number of blocks to pre-erase by the multiple block write + // command. We don't care about the response - if the command is not + // accepted, writes will just be a bit slower. Max 22bit parameter. + uint32 blocks = sdSectors > 0x7FFFFF ? 0x7FFFFF : sdSectors; + sdCommandAndResponse(SD_APP_CMD, 0); + sdCommandAndResponse(SD_APP_SET_WR_BLK_ERASE_COUNT, blocks); + + uint8_t v = sdCommandAndResponse(SD_WRITE_MULTIPLE_BLOCK, sdLBA); + if (unlikely(v)) + { + scsiDiskReset(); + sdClearStatus(); + scsiDev.status = CHECK_CONDITION; + scsiDev.target->sense.code = HARDWARE_ERROR; + scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE; + scsiDev.phase = STATUS; + } + else + { + sdCmdTime = getTime_ms(); + sdCmdNextLBA = tmpNextLBA; + sdCmdState = CMD_STATE_WRITE; + } } } void sdPoll() +{ + if ((scsiDev.phase == BUS_FREE) && + (sdCmdState != CMD_STATE_IDLE) && + (elapsedTime_ms(sdCmdTime) >= 50)) + { + sdPreCmdState(CMD_STATE_IDLE); + } +} + +void sdCheckPresent() { // Check if there's an SD card present. if ((scsiDev.phase == BUS_FREE) && - (sdIOState == SD_IDLE)) + (sdIOState == SD_IDLE) && + (sdCmdState == CMD_STATE_IDLE)) { // The CS line is pulled high by the SD card. // De-assert the line, and check if it's high. @@ -916,6 +977,13 @@ void sdPoll() { blockDev.state |= DISK_PRESENT | DISK_INITIALISED; + // Always "start" the device. Many systems (eg. Apple System 7) + // won't respond properly to + // LOGICAL_UNIT_NOT_READY_INITIALIZING_COMMAND_REQUIRED sense + // code, even if they stopped it first with + // START STOP UNIT command. + blockDev.state |= DISK_STARTED; + if (!firstInit) { int i; diff --git a/software/SCSI2SD/src/sd.h b/software/SCSI2SD/src/sd.h index 3b4a11db..8ffcee7d 100755 --- a/software/SCSI2SD/src/sd.h +++ b/software/SCSI2SD/src/sd.h @@ -68,17 +68,17 @@ int sdInit(void); #define sdDMABusy() (!(sdRxDMAComplete && sdTxDMAComplete)) -void sdWriteMultiSectorPrep(void); +void sdWriteMultiSectorPrep(uint32_t sdLBA, uint32_t sdSectors); void sdWriteMultiSectorDMA(uint8_t* outputBuffer); -int sdWriteSectorDMAPoll(int sendStopToken); -void sdCompleteWrite(void); +int sdWriteSectorDMAPoll(); -void sdReadMultiSectorPrep(void); +void sdReadMultiSectorPrep(uint32_t sdLBA, uint32_t sdSectors); void sdReadMultiSectorDMA(uint8_t* outputBuffer); void sdReadSingleSectorDMA(uint32_t lba, uint8_t* outputBuffer); int sdReadSectorDMAPoll(); -void sdCompleteRead(void); +void sdCompleteTransfer(void); +void sdCheckPresent(); void sdPoll(); #endif diff --git a/software/SCSI2SD/src/trace.c b/software/SCSI2SD/src/trace.c old mode 100644 new mode 100755 index 643241b6..1aa4eb9d --- a/software/SCSI2SD/src/trace.c +++ b/software/SCSI2SD/src/trace.c @@ -46,6 +46,8 @@ #define TPIU_FFCR_ENFCONT (1 << 1) +uint8_t LastTrace; + void traceInit(void) { // enable the trace module clocks CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; diff --git a/software/SCSI2SD/src/trace.h b/software/SCSI2SD/src/trace.h index 00d44d4c..95829167 100755 --- a/software/SCSI2SD/src/trace.h +++ b/software/SCSI2SD/src/trace.h @@ -15,6 +15,8 @@ // You should have received a copy of the GNU General Public License // along with SCSI2SD. If not, see . +extern uint8_t LastTrace; + // Trace event IDs to be output. 1 and 9 are generated as headers on ports 0 // and 1 respectively, and should not be used. enum trace_event { @@ -71,6 +73,6 @@ void traceInit(void); ITM->PORT[1].u8 = ch; } #else - #define trace(ev) - #define traceIrq(ev) + #define trace(ev) LastTrace = ev + #define traceIrq(ev) LastTrace = ev #endif diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c index d5def201..8e9bbe0d 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c @@ -20,6 +20,7 @@ #include #include + #if !defined(Debug_Timer_Interrupt__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void Debug_Timer_Interrupt_Stop(void) *******************************************************************************/ CY_ISR(Debug_Timer_Interrupt_Interrupt) { + #ifdef Debug_Timer_Interrupt_INTERRUPT_INTERRUPT_CALLBACK + Debug_Timer_Interrupt_Interrupt_InterruptCallback(); + #endif /* Debug_Timer_Interrupt_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START Debug_Timer_Interrupt_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c index b07d7cfb..fb8e582d 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_RST_ISR__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_RST_ISR_Stop(void) *******************************************************************************/ CY_ISR(SCSI_RST_ISR_Interrupt) { + #ifdef SCSI_RST_ISR_INTERRUPT_INTERRUPT_CALLBACK + SCSI_RST_ISR_Interrupt_InterruptCallback(); + #endif /* SCSI_RST_ISR_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_RST_ISR_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c index 5553fba8..b2633aaf 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_RX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_RX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SCSI_RX_DMA_COMPLETE_Interrupt) { + #ifdef SCSI_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SCSI_RX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SCSI_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_RX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c index ffe9fd5b..e274d74e 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_SEL_ISR__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_SEL_ISR_Stop(void) *******************************************************************************/ CY_ISR(SCSI_SEL_ISR_Interrupt) { + #ifdef SCSI_SEL_ISR_INTERRUPT_INTERRUPT_CALLBACK + SCSI_SEL_ISR_Interrupt_InterruptCallback(); + #endif /* SCSI_SEL_ISR_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_SEL_ISR_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c index cdb5ec56..20517cc4 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_TX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_TX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SCSI_TX_DMA_COMPLETE_Interrupt) { + #ifdef SCSI_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SCSI_TX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SCSI_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_TX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c index b15cfe84..94260ef5 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SD_RX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SD_RX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SD_RX_DMA_COMPLETE_Interrupt) { + #ifdef SD_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SD_RX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SD_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SD_RX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c index 383a7585..7203eb82 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SD_TX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SD_TX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SD_TX_DMA_COMPLETE_Interrupt) { + #ifdef SD_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SD_TX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SD_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SD_TX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c old mode 100644 new mode 100755 index 2cd1304a..58fa966f --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c @@ -17,6 +17,7 @@ #include "USBFS.h" + #if defined(USBFS_ENABLE_AUDIO_CLASS) #include "USBFS_audio.h" @@ -124,6 +125,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_READ_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_READ_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_READ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_READ_REQUESTS_CALLBACK */ + break; default: break; @@ -142,7 +148,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ - /* Entity ID Control Selector is MUTE */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_MUTE_CONTROL_GET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_MUTE_CONTROL_GET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_MUTE_CONTROL_GET_REQUEST_CALLBACK */ + + /* Entity ID Control Selector is MUTE */ USBFS_currentTD.wCount = 1u; USBFS_currentTD.pData = &USBFS_currentMute; requestHandled = USBFS_InitControlRead(); @@ -153,6 +163,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_GET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_VOLUME_CONTROL_GET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_GET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is VOLUME, */ USBFS_currentTD.wCount = USBFS_VOLUME_LEN; USBFS_currentTD.pData = USBFS_currentVolume; @@ -163,6 +177,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START OTHER_GET_CUR_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_OTHER_GET_CUR_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_OTHER_GET_CUR_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_OTHER_GET_CUR_REQUESTS_CALLBACK */ } break; case USBFS_GET_MIN: /* GET_MIN */ @@ -205,6 +223,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_WRITE_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_WRITE_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_WRITE_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_WRITE_REQUESTS_CALLBACK */ + break; default: break; @@ -237,6 +260,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_SAMPLING_FREQ_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_SAMPLING_FREQ_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_SAMPLING_FREQ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_SAMPLING_FREQ_REQUESTS_CALLBACK */ + break; default: break; @@ -255,6 +283,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_MUTE_SET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_MUTE_SET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_MUTE_SET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is MUTE */ USBFS_currentTD.wCount = 1u; USBFS_currentTD.pData = &USBFS_currentMute; @@ -266,6 +298,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_SET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_VOLUME_CONTROL_SET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_SET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is VOLUME */ USBFS_currentTD.wCount = USBFS_VOLUME_LEN; USBFS_currentTD.pData = USBFS_currentVolume; @@ -276,12 +312,21 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START OTHER_SET_CUR_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_OTHER_SET_CUR_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_OTHER_SET_CUR_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_OTHER_SET_CUR_REQUESTS_CALLBACK */ } #endif /* USBFS_ENABLE_AUDIO_STREAMING */ /* `#START AUDIO_CONTROL_SEL_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_CONTROL_SEL_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_CONTROL_SEL_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_CONTROL_SEL_REQUESTS_CALLBACK */ + break; default: break; diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c old mode 100644 new mode 100755 index 63ebf120..7b0bb9b7 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c @@ -23,6 +23,7 @@ #include "USBFS_pvt.h" + /*************************************** * CDC Variables ***************************************/ @@ -104,6 +105,10 @@ uint8 USBFS_DispatchCDCClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CDC_CLASS_CDC_READ_REQUESTS_CALLBACK + USBFS_DispatchCDCClass_CDC_READ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_CDC_CLASS_CDC_READ_REQUESTS_CALLBACK */ + default: /* requestHandled is initialized as FALSE by default */ break; } @@ -130,6 +135,10 @@ uint8 USBFS_DispatchCDCClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CDC_CLASS_CDC_WRITE_REQUESTS_CALLBACK + USBFS_DispatchCDCClass_CDC_WRITE_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_CDC_CLASS_CDC_WRITE_REQUESTS_CALLBACK */ + default: /* requestHandled is initialized as FALSE by default */ break; } diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c old mode 100644 new mode 100755 index a9801ead..7ce5887d --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c @@ -21,6 +21,7 @@ #include "USBFS_pvt.h" + /*************************************** * User Implemented Class Driver Declarations. ***************************************/ @@ -89,6 +90,10 @@ uint8 USBFS_DispatchClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CLASS_RQST_CALLBACK + USBFS_DispatchClassRqst_Callback(); + #endif /* USBFS_DISPATCH_CLASS_RQST_CALLBACK */ + return(requestHandled); } diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c old mode 100644 new mode 100755 index 282c938d..39820f90 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c @@ -18,6 +18,7 @@ #include "USBFS_pvt.h" + /*************************************** * Global data allocation ***************************************/ @@ -68,7 +69,10 @@ CY_ISR(USBFS_EP_0_ISR) uint8 bRegTemp; uint8 modifyReg; - + #ifdef USBFS_EP_0_ISR_ENTRY_CALLBACK + USBFS_EP_0_ISR_EntryCallback(); + #endif /* USBFS_EP_0_ISR_ENTRY_CALLBACK */ + bRegTemp = CY_GET_REG8(USBFS_EP0_CR_PTR); if ((bRegTemp & USBFS_MODE_ACKD) != 0u) { @@ -128,6 +132,9 @@ CY_ISR(USBFS_EP_0_ISR) } } } + #ifdef USBFS_EP_0_ISR_EXIT_CALLBACK + USBFS_EP_0_ISR_ExitCallback(); + #endif /* USBFS_EP_0_ISR_EXIT_CALLBACK */ } diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c old mode 100644 new mode 100755 index b3cd8e33..56a4a29a --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c @@ -16,6 +16,7 @@ #include "USBFS.h" #include "USBFS_pvt.h" + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && (USBFS_ENABLE_MIDI_API != 0u)) #include "USBFS_midi.h" #endif /* (defined(USBFS_ENABLE_MIDI_STREAMING) && (USBFS_ENABLE_MIDI_API != 0u)) */ @@ -57,6 +58,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_1_ISR_ENTRY_CALLBACK + USBFS_EP_1_ISR_EntryCallback(); + #endif /* USBFS_EP_1_ISR_ENTRY_CALLBACK */ + /* `#START EP1_USER_CODE` Place your code here */ /* `#END` */ @@ -90,6 +95,10 @@ /* `#END` */ + #ifdef USBFS_EP_1_ISR_EXIT_CALLBACK + USBFS_EP_1_ISR_ExitCallback(); + #endif /* USBFS_EP_1_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -122,6 +131,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_2_ISR_ENTRY_CALLBACK + USBFS_EP_2_ISR_EntryCallback(); + #endif /* USBFS_EP_2_ISR_ENTRY_CALLBACK */ + /* `#START EP2_USER_CODE` Place your code here */ /* `#END` */ @@ -155,6 +168,10 @@ /* `#END` */ + #ifdef USBFS_EP_2_ISR_EXIT_CALLBACK + USBFS_EP_2_ISR_ExitCallback(); + #endif /* USBFS_EP_2_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -187,6 +204,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_3_ISR_ENTRY_CALLBACK + USBFS_EP_3_ISR_EntryCallback(); + #endif /* USBFS_EP_3_ISR_ENTRY_CALLBACK */ + /* `#START EP3_USER_CODE` Place your code here */ /* `#END` */ @@ -220,6 +241,10 @@ /* `#END` */ + #ifdef USBFS_EP_3_ISR_EXIT_CALLBACK + USBFS_EP_3_ISR_ExitCallback(); + #endif /* USBFS_EP_3_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -252,6 +277,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_4_ISR_ENTRY_CALLBACK + USBFS_EP_4_ISR_EntryCallback(); + #endif /* USBFS_EP_4_ISR_ENTRY_CALLBACK */ + /* `#START EP4_USER_CODE` Place your code here */ /* `#END` */ @@ -285,6 +314,10 @@ /* `#END` */ + #ifdef USBFS_EP_4_ISR_EXIT_CALLBACK + USBFS_EP_4_ISR_ExitCallback(); + #endif /* USBFS_EP_4_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -317,6 +350,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_5_ISR_ENTRY_CALLBACK + USBFS_EP_5_ISR_EntryCallback(); + #endif /* USBFS_EP_5_ISR_ENTRY_CALLBACK */ + /* `#START EP5_USER_CODE` Place your code here */ /* `#END` */ @@ -350,6 +387,10 @@ /* `#END` */ + #ifdef USBFS_EP_5_ISR_EXIT_CALLBACK + USBFS_EP_5_ISR_ExitCallback(); + #endif /* USBFS_EP_5_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -381,6 +422,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_6_ISR_ENTRY_CALLBACK + USBFS_EP_6_ISR_EntryCallback(); + #endif /* USBFS_EP_6_ISR_ENTRY_CALLBACK */ + /* `#START EP6_USER_CODE` Place your code here */ /* `#END` */ @@ -414,6 +459,10 @@ /* `#END` */ + #ifdef USBFS_EP_6_ISR_EXIT_CALLBACK + USBFS_EP_6_ISR_ExitCallback(); + #endif /* USBFS_EP_6_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -446,6 +495,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_7_ISR_ENTRY_CALLBACK + USBFS_EP_7_ISR_EntryCallback(); + #endif /* USBFS_EP_7_ISR_ENTRY_CALLBACK */ + /* `#START EP7_USER_CODE` Place your code here */ /* `#END` */ @@ -479,6 +532,10 @@ /* `#END` */ + #ifdef USBFS_EP_7_ISR_EXIT_CALLBACK + USBFS_EP_7_ISR_ExitCallback(); + #endif /* USBFS_EP_7_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -511,6 +568,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_8_ISR_ENTRY_CALLBACK + USBFS_EP_8_ISR_EntryCallback(); + #endif /* USBFS_EP_8_ISR_ENTRY_CALLBACK */ + /* `#START EP8_USER_CODE` Place your code here */ /* `#END` */ @@ -544,6 +605,10 @@ /* `#END` */ + #ifdef USBFS_EP_8_ISR_EXIT_CALLBACK + USBFS_EP_8_ISR_ExitCallback(); + #endif /* USBFS_EP_8_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -569,6 +634,10 @@ *******************************************************************************/ CY_ISR(USBFS_SOF_ISR) { + #ifdef USBFS_SOF_ISR_INTERRUPT_CALLBACK + USBFS_SOF_ISR_InterruptCallback(); + #endif /* USBFS_SOF_ISR_INTERRUPT_CALLBACK */ + /* `#START SOF_USER_CODE` Place your code here */ /* `#END` */ @@ -592,11 +661,19 @@ CY_ISR(USBFS_SOF_ISR) *******************************************************************************/ CY_ISR(USBFS_BUS_RESET_ISR) { + #ifdef USBFS_BUS_RESET_ISR_ENTRY_CALLBACK + USBFS_BUS_RESET_ISR_EntryCallback(); + #endif /* USBFS_BUS_RESET_ISR_ENTRY_CALLBACK */ + /* `#START BUS_RESET_USER_CODE` Place your code here */ /* `#END` */ USBFS_ReInitComponent(); + + #ifdef USBFS_BUS_RESET_ISR_EXIT_CALLBACK + USBFS_BUS_RESET_ISR_ExitCallback(); + #endif /* USBFS_BUS_RESET_ISR_EXIT_CALLBACK */ } @@ -627,6 +704,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) uint8 ep = USBFS_EP1; uint8 ptr = 0u; + #ifdef USBFS_ARB_ISR_ENTRY_CALLBACK + USBFS_ARB_ISR_EntryCallback(); + #endif /* USBFS_ARB_ISR_ENTRY_CALLBACK */ + /* `#START ARB_BEGIN_USER_CODE` Place your code here */ /* `#END` */ @@ -687,6 +768,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#END` */ + #ifdef USBFS_ARB_ISR_CALLBACK + USBFS_ARB_ISR_Callback(); + #endif /* USBFS_ARB_ISR_CALLBACK */ + CY_SET_REG8((reg8 *)(USBFS_ARB_EP1_SR_IND + ptr), ep_status); /* Clear Serviced events */ } ptr += USBFS_EPX_CNTX_ADDR_OFFSET; /* prepare pointer for next EP */ @@ -697,6 +782,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#START ARB_END_USER_CODE` Place your code here */ /* `#END` */ + + #ifdef USBFS_ARB_ISR_EXIT_CALLBACK + USBFS_ARB_ISR_ExitCallback(); + #endif /* USBFS_ARB_ISR_EXIT_CALLBACK */ } #endif /* USBFS_EP_MM */ @@ -724,6 +813,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) uint8 ep = USBFS_EP1; uint8 ptr = 0u; + #ifdef USBFS_EP_DMA_DONE_ISR_ENTRY_CALLBACK + USBFS_EP_DMA_DONE_ISR_EntryCallback(); + #endif /* USBFS_EP_DMA_DONE_ISR_ENTRY_CALLBACK */ + /* `#START EP_DMA_DONE_BEGIN_USER_CODE` Place your code here */ /* `#END` */ @@ -747,6 +840,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#END` */ + #ifdef USBFS_EP_DMA_DONE_ISR_CALLBACK + USBFS_EP_DMA_DONE_ISR_Callback(); + #endif /* USBFS_EP_DMA_DONE_ISR_CALLBACK */ + CY_SET_REG8((reg8 *)(USBFS_ARB_RW1_WA_MSB_IND + ptr), 0x00u); /* repeat 2 last bytes to prefetch endpoint area */ CY_SET_REG8((reg8 *)(USBFS_ARB_RW1_WA_IND + ptr), @@ -773,6 +870,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#START EP_DMA_DONE_END_USER_CODE` Place your code here */ /* `#END` */ + + #ifdef USBFS_EP_DMA_DONE_ISR_EXIT_CALLBACK + USBFS_EP_DMA_DONE_ISR_ExitCallback(); + #endif /* USBFS_EP_DMA_DONE_ISR_EXIT_CALLBACK */ } #endif /* ((USBFS_EP_MM == USBFS__EP_DMAAUTO) && (USBFS_EP_DMA_AUTO_OPT == 0u)) */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c old mode 100644 new mode 100755 index fedf8b0b..dac538b8 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c @@ -25,6 +25,7 @@ #include "USBFS_hid.h" + /*************************************** * HID Variables ***************************************/ @@ -375,6 +376,11 @@ void USBFS_FindReport(void) /* `#START HID_FINDREPORT` Place custom handling here */ /* `#END` */ + + #ifdef USBFS_FIND_REPORT_CALLBACK + USBFS_FindReport_Callback(); + #endif /* USBFS_FIND_REPORT_CALLBACK */ + USBFS_currentTD.count = 0u; /* Init not supported condition */ pTmp = USBFS_GetConfigTablePtr(USBFS_configuration - 1u); reportType = CY_GET_REG8(USBFS_wValueHi); diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c old mode 100644 new mode 100755 index be7060bf..5ea6b844 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c @@ -26,6 +26,7 @@ #include "USBFS_pvt.h" + /*************************************** * MIDI Constants ***************************************/ @@ -269,6 +270,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START CUSTOM_MIDI_OUT_EP_SERV` Place your code here */ /* `#END` */ + + #ifdef USBFS_MIDI_OUT_EP_SERVICE_CALLBACK + USBFS_MIDI_OUT_EP_Service_Callback(); + #endif /* USBFS_MIDI_OUT_EP_SERVICE_CALLBACK */ } #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_ONE_EXT_INTRF) */ @@ -732,6 +737,9 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI_INIT_CALLBACK + USBFS_MIDI_Init_Callback(); + #endif /* USBFS_MIDI_INIT_CALLBACK */ } @@ -1046,6 +1054,10 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI1_PROCESS_USB_OUT_ENTRY_CALLBACK + USBFS_MIDI1_ProcessUsbOut_EntryCallback(); + #endif /* USBFS_MIDI1_PROCESS_USB_OUT_ENTRY_CALLBACK */ + cmd = epBuf[USBFS_EVENT_BYTE0] & USBFS_CIN_MASK; if((cmd != USBFS_RESERVED0) && (cmd != USBFS_RESERVED1)) { @@ -1118,6 +1130,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START MIDI1_PROCESS_OUT_END` */ /* `#END` */ + + #ifdef USBFS_MIDI1_PROCESS_USB_OUT_EXIT_CALLBACK + USBFS_MIDI1_ProcessUsbOut_ExitCallback(); + #endif /* USBFS_MIDI1_PROCESS_USB_OUT_EXIT_CALLBACK */ } @@ -1269,6 +1285,10 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI2_PROCESS_USB_OUT_ENTRY_CALLBACK + USBFS_MIDI2_ProcessUsbOut_EntryCallback(); + #endif /* USBFS_MIDI2_PROCESS_USB_OUT_ENTRY_CALLBACK */ + cmd = epBuf[USBFS_EVENT_BYTE0] & USBFS_CIN_MASK; if((cmd != USBFS_RESERVED0) && (cmd != USBFS_RESERVED1)) { @@ -1341,6 +1361,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START MIDI2_PROCESS_OUT_END` */ /* `#END` */ + + #ifdef USBFS_MIDI2_PROCESS_USB_OUT_EXIT_CALLBACK + USBFS_MIDI2_ProcessUsbOut_ExitCallback(); + #endif /* USBFS_MIDI2_PROCESS_USB_OUT_EXIT_CALLBACK */ } #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_TWO_EXT_INTRF) */ #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_ONE_EXT_INTRF) */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c old mode 100644 new mode 100755 index 3540214e..bcf75253 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c @@ -19,6 +19,7 @@ #include "USBFS_pvt.h" + /*************************************** * Custom Declarations ***************************************/ @@ -53,12 +54,20 @@ static USBFS_BACKUP_STRUCT USBFS_backup; *******************************************************************************/ CY_ISR(USBFS_DP_ISR) { + #ifdef USBFS_DP_ISR_ENTRY_CALLBACK + USBFS_DP_ISR_EntryCallback(); + #endif /* USBFS_DP_ISR_ENTRY_CALLBACK */ + /* `#START DP_USER_CODE` Place your code here */ /* `#END` */ /* Clears active interrupt */ CY_GET_REG8(USBFS_DP_INTSTAT_PTR); + + #ifdef USBFS_DP_ISR_EXIT_CALLBACK + USBFS_DP_ISR_ExitCallback(); + #endif /* USBFS_DP_ISR_EXIT_CALLBACK */ } #endif /* (USBFS_DP_ISR_REMOVE == 0u) */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c old mode 100644 new mode 100755 index ef4d5f14..78e95ad6 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c @@ -17,6 +17,7 @@ #include "USBFS.h" #include "USBFS_pvt.h" + #if(USBFS_EXTERN_VND == USBFS_FALSE) @@ -77,6 +78,10 @@ uint8 USBFS_HandleVendorRqst(void) /* `#END` */ + #ifdef USBFS_HANDLE_VENDOR_RQST_CALLBACK + USBFS_HandleVendorRqst_Callback(); + #endif /* USBFS_HANDLE_VENDOR_RQST_CALLBACK */ + return(requestHandled); } @@ -89,7 +94,6 @@ uint8 USBFS_HandleVendorRqst(void) /* `#END` */ - #endif /* USBFS_EXTERN_VND */ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c old mode 100644 new mode 100755 index d4fece0f..4617ce7a --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c @@ -2,6 +2,7 @@ #include "cytypes.h" +#if (!CYDEV_BOOTLOADER_ENABLE) #if defined(__GNUC__) || defined(__ARMCC_VERSION) __attribute__ ((__section__(".cyloadermeta"), used)) @@ -19,6 +20,8 @@ const uint8 cy_meta_loader[] = { 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}; +#endif /* (!CYDEV_BOOTLOADER_ENABLE) */ + #if defined(__GNUC__) || defined(__ARMCC_VERSION) __attribute__ ((__section__(".cybootloader"), used)) diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareexport.ld b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareexport.ld new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.ld b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.ld new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.scat b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.scat new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h index 8164d502..f98fb500 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevice.h +* File Name: cydevice.h * OBSOLETE: Do not use this file. Use the _trm version instead. -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h index b91669dc..02dbced7 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevice_trm.h +* File Name: cydevice_trm.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc index 72dac869..e550a131 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevicegnu.inc +* File Name: cydevicegnu.inc * OBSOLETE: Do not use this file. Use the _trm version instead. -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc index a81dc5ec..78bb5777 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevicegnu_trm.inc +* File Name: cydevicegnu_trm.inc * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc index 046a333e..45156fe5 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydeviceiar.inc +; File Name: cydeviceiar.inc ; OBSOLETE: Do not use this file. Use the _trm version instead. -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc index 4ac5f32f..17aba9bd 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydeviceiar_trm.inc +; File Name: cydeviceiar_trm.inc ; -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc index f84a9491..67890e89 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydevicerv.inc +; File Name: cydevicerv.inc ; OBSOLETE: Do not use this file. Use the _trm version instead. -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc index a5b5b593..0175ff34 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydevicerv_trm.inc +; File Name: cydevicerv_trm.inc ; -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h index e150c42f..a859ebfc 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h @@ -4,6 +4,7 @@ #include "cydevice_trm.h" /* LED1 */ +#define LED1__0__INTTYPE CYREG_PICU12_INTTYPE3 #define LED1__0__MASK 0x08u #define LED1__0__PC CYREG_PRT12_PC3 #define LED1__0__PORT 12u @@ -17,6 +18,7 @@ #define LED1__DM2 CYREG_PRT12_DM2 #define LED1__DR CYREG_PRT12_DR #define LED1__INP_DIS CYREG_PRT12_INP_DIS +#define LED1__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU12_BASE #define LED1__MASK 0x08u #define LED1__PORT 12u #define LED1__PRT CYREG_PRT12_PRT @@ -35,6 +37,7 @@ #define LED1__SLW CYREG_PRT12_SLW /* SD_CD */ +#define SD_CD__0__INTTYPE CYREG_PICU3_INTTYPE6 #define SD_CD__0__MASK 0x40u #define SD_CD__0__PC CYREG_PRT3_PC6 #define SD_CD__0__PORT 3u @@ -50,6 +53,7 @@ #define SD_CD__DM2 CYREG_PRT3_DM2 #define SD_CD__DR CYREG_PRT3_DR #define SD_CD__INP_DIS CYREG_PRT3_INP_DIS +#define SD_CD__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_CD__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_CD__LCD_EN CYREG_PRT3_LCD_EN #define SD_CD__MASK 0x40u @@ -67,6 +71,7 @@ #define SD_CD__SLW CYREG_PRT3_SLW /* SD_CS */ +#define SD_CS__0__INTTYPE CYREG_PICU3_INTTYPE4 #define SD_CS__0__MASK 0x10u #define SD_CS__0__PC CYREG_PRT3_PC4 #define SD_CS__0__PORT 3u @@ -82,6 +87,7 @@ #define SD_CS__DM2 CYREG_PRT3_DM2 #define SD_CS__DR CYREG_PRT3_DR #define SD_CS__INP_DIS CYREG_PRT3_INP_DIS +#define SD_CS__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_CS__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_CS__LCD_EN CYREG_PRT3_LCD_EN #define SD_CS__MASK 0x10u @@ -119,6 +125,7 @@ #define USBFS_bus_reset__INTC_SET_PD_REG CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +#define USBFS_Dm__0__INTTYPE CYREG_PICU15_INTTYPE7 #define USBFS_Dm__0__MASK 0x80u #define USBFS_Dm__0__PC CYREG_IO_PC_PRT15_7_6_PC1 #define USBFS_Dm__0__PORT 15u @@ -134,6 +141,7 @@ #define USBFS_Dm__DM2 CYREG_PRT15_DM2 #define USBFS_Dm__DR CYREG_PRT15_DR #define USBFS_Dm__INP_DIS CYREG_PRT15_INP_DIS +#define USBFS_Dm__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU15_BASE #define USBFS_Dm__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define USBFS_Dm__LCD_EN CYREG_PRT15_LCD_EN #define USBFS_Dm__MASK 0x80u @@ -151,6 +159,7 @@ #define USBFS_Dm__SLW CYREG_PRT15_SLW /* USBFS_Dp */ +#define USBFS_Dp__0__INTTYPE CYREG_PICU15_INTTYPE6 #define USBFS_Dp__0__MASK 0x40u #define USBFS_Dp__0__PC CYREG_IO_PC_PRT15_7_6_PC0 #define USBFS_Dp__0__PORT 15u @@ -167,6 +176,7 @@ #define USBFS_Dp__DR CYREG_PRT15_DR #define USBFS_Dp__INP_DIS CYREG_PRT15_INP_DIS #define USBFS_Dp__INTSTAT CYREG_PICU15_INTSTAT +#define USBFS_Dp__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU15_BASE #define USBFS_Dp__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define USBFS_Dp__LCD_EN CYREG_PRT15_LCD_EN #define USBFS_Dp__MASK 0x40u @@ -381,34 +391,34 @@ #define USBFS_USB__USBIO_CR1 CYREG_USB_USBIO_CR1 /* SDCard_BSPIM */ -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG CYREG_B1_UDB05_06_ACTL -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG CYREG_B1_UDB05_06_CTL -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG CYREG_B1_UDB05_06_CTL -#define SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG CYREG_B1_UDB05_06_CTL -#define SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG CYREG_B1_UDB05_06_CTL -#define SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG CYREG_B1_UDB05_06_MSK -#define SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG CYREG_B1_UDB05_06_MSK -#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG CYREG_B1_UDB05_06_MSK -#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG CYREG_B1_UDB05_06_MSK -#define SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG CYREG_B1_UDB05_ACTL -#define SDCard_BSPIM_BitCounter__CONTROL_REG CYREG_B1_UDB05_CTL -#define SDCard_BSPIM_BitCounter__CONTROL_ST_REG CYREG_B1_UDB05_ST_CTL -#define SDCard_BSPIM_BitCounter__COUNT_REG CYREG_B1_UDB05_CTL -#define SDCard_BSPIM_BitCounter__COUNT_ST_REG CYREG_B1_UDB05_ST_CTL -#define SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL -#define SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL -#define SDCard_BSPIM_BitCounter__PERIOD_REG CYREG_B1_UDB05_MSK -#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG CYREG_B1_UDB05_06_ACTL -#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG CYREG_B1_UDB05_06_ST -#define SDCard_BSPIM_BitCounter_ST__MASK_REG CYREG_B1_UDB05_MSK -#define SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL -#define SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG CYREG_B1_UDB05_ACTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG CYREG_B1_UDB05_ST_CTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG CYREG_B1_UDB05_ST_CTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_REG CYREG_B1_UDB05_ST -#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG CYREG_B1_UDB06_07_ACTL -#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG CYREG_B1_UDB06_07_ST +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB07_08_ACTL +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB07_08_CTL +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB07_08_CTL +#define SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB07_08_CTL +#define SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG CYREG_B0_UDB07_08_CTL +#define SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG CYREG_B0_UDB07_08_MSK +#define SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG CYREG_B0_UDB07_08_MSK +#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG CYREG_B0_UDB07_08_MSK +#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB07_08_MSK +#define SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG CYREG_B0_UDB07_ACTL +#define SDCard_BSPIM_BitCounter__CONTROL_REG CYREG_B0_UDB07_CTL +#define SDCard_BSPIM_BitCounter__CONTROL_ST_REG CYREG_B0_UDB07_ST_CTL +#define SDCard_BSPIM_BitCounter__COUNT_REG CYREG_B0_UDB07_CTL +#define SDCard_BSPIM_BitCounter__COUNT_ST_REG CYREG_B0_UDB07_ST_CTL +#define SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB07_MSK_ACTL +#define SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG CYREG_B0_UDB07_MSK_ACTL +#define SDCard_BSPIM_BitCounter__PERIOD_REG CYREG_B0_UDB07_MSK +#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB07_08_ACTL +#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG CYREG_B0_UDB07_08_ST +#define SDCard_BSPIM_BitCounter_ST__MASK_REG CYREG_B0_UDB07_MSK +#define SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG CYREG_B0_UDB07_MSK_ACTL +#define SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG CYREG_B0_UDB07_MSK_ACTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG CYREG_B0_UDB07_ACTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG CYREG_B0_UDB07_ST_CTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG CYREG_B0_UDB07_ST_CTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_REG CYREG_B0_UDB07_ST +#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG CYREG_B1_UDB08_09_ACTL +#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG CYREG_B1_UDB08_09_ST #define SDCard_BSPIM_RxStsReg__4__MASK 0x10u #define SDCard_BSPIM_RxStsReg__4__POS 4 #define SDCard_BSPIM_RxStsReg__5__MASK 0x20u @@ -416,9 +426,9 @@ #define SDCard_BSPIM_RxStsReg__6__MASK 0x40u #define SDCard_BSPIM_RxStsReg__6__POS 6 #define SDCard_BSPIM_RxStsReg__MASK 0x70u -#define SDCard_BSPIM_RxStsReg__MASK_REG CYREG_B1_UDB06_MSK -#define SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG CYREG_B1_UDB06_ACTL -#define SDCard_BSPIM_RxStsReg__STATUS_REG CYREG_B1_UDB06_ST +#define SDCard_BSPIM_RxStsReg__MASK_REG CYREG_B1_UDB08_MSK +#define SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG CYREG_B1_UDB08_ACTL +#define SDCard_BSPIM_RxStsReg__STATUS_REG CYREG_B1_UDB08_ST #define SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG CYREG_B1_UDB04_05_A0 #define SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG CYREG_B1_UDB04_05_A1 #define SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG CYREG_B1_UDB04_05_D0 @@ -454,6 +464,7 @@ #define SDCard_BSPIM_TxStsReg__STATUS_REG CYREG_B1_UDB07_ST /* SD_SCK */ +#define SD_SCK__0__INTTYPE CYREG_PICU3_INTTYPE2 #define SD_SCK__0__MASK 0x04u #define SD_SCK__0__PC CYREG_PRT3_PC2 #define SD_SCK__0__PORT 3u @@ -469,6 +480,7 @@ #define SD_SCK__DM2 CYREG_PRT3_DM2 #define SD_SCK__DR CYREG_PRT3_DR #define SD_SCK__INP_DIS CYREG_PRT3_INP_DIS +#define SD_SCK__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_SCK__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_SCK__LCD_EN CYREG_PRT3_LCD_EN #define SD_SCK__MASK 0x04u @@ -497,6 +509,7 @@ #define SCSI_In__0__DM2 CYREG_PRT2_DM2 #define SCSI_In__0__DR CYREG_PRT2_DR #define SCSI_In__0__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In__0__INTTYPE CYREG_PICU2_INTTYPE0 #define SCSI_In__0__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In__0__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In__0__MASK 0x01u @@ -524,6 +537,7 @@ #define SCSI_In__1__DM2 CYREG_PRT6_DM2 #define SCSI_In__1__DR CYREG_PRT6_DR #define SCSI_In__1__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In__1__INTTYPE CYREG_PICU6_INTTYPE7 #define SCSI_In__1__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In__1__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In__1__MASK 0x80u @@ -551,6 +565,7 @@ #define SCSI_In__2__DM2 CYREG_PRT5_DM2 #define SCSI_In__2__DR CYREG_PRT5_DR #define SCSI_In__2__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__2__INTTYPE CYREG_PICU5_INTTYPE1 #define SCSI_In__2__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__2__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__2__MASK 0x02u @@ -578,6 +593,7 @@ #define SCSI_In__3__DM2 CYREG_PRT5_DM2 #define SCSI_In__3__DR CYREG_PRT5_DR #define SCSI_In__3__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__3__INTTYPE CYREG_PICU5_INTTYPE2 #define SCSI_In__3__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__3__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__3__MASK 0x04u @@ -605,6 +621,7 @@ #define SCSI_In__4__DM2 CYREG_PRT5_DM2 #define SCSI_In__4__DR CYREG_PRT5_DR #define SCSI_In__4__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__4__INTTYPE CYREG_PICU5_INTTYPE3 #define SCSI_In__4__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__4__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__4__MASK 0x08u @@ -632,6 +649,7 @@ #define SCSI_In__CD__DM2 CYREG_PRT5_DM2 #define SCSI_In__CD__DR CYREG_PRT5_DR #define SCSI_In__CD__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__CD__INTTYPE CYREG_PICU5_INTTYPE1 #define SCSI_In__CD__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__CD__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__CD__MASK 0x02u @@ -659,6 +677,7 @@ #define SCSI_In__DBP__DM2 CYREG_PRT2_DM2 #define SCSI_In__DBP__DR CYREG_PRT2_DR #define SCSI_In__DBP__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In__DBP__INTTYPE CYREG_PICU2_INTTYPE0 #define SCSI_In__DBP__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In__DBP__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In__DBP__MASK 0x01u @@ -686,6 +705,7 @@ #define SCSI_In__IO__DM2 CYREG_PRT5_DM2 #define SCSI_In__IO__DR CYREG_PRT5_DR #define SCSI_In__IO__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__IO__INTTYPE CYREG_PICU5_INTTYPE3 #define SCSI_In__IO__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__IO__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__IO__MASK 0x08u @@ -713,6 +733,7 @@ #define SCSI_In__MSG__DM2 CYREG_PRT6_DM2 #define SCSI_In__MSG__DR CYREG_PRT6_DR #define SCSI_In__MSG__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In__MSG__INTTYPE CYREG_PICU6_INTTYPE7 #define SCSI_In__MSG__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In__MSG__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In__MSG__MASK 0x80u @@ -740,6 +761,7 @@ #define SCSI_In__REQ__DM2 CYREG_PRT5_DM2 #define SCSI_In__REQ__DR CYREG_PRT5_DR #define SCSI_In__REQ__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In__REQ__INTTYPE CYREG_PICU5_INTTYPE2 #define SCSI_In__REQ__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In__REQ__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In__REQ__MASK 0x04u @@ -767,6 +789,7 @@ #define SCSI_In_DBx__0__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__0__DR CYREG_PRT12_DR #define SCSI_In_DBx__0__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__0__INTTYPE CYREG_PICU12_INTTYPE4 #define SCSI_In_DBx__0__MASK 0x10u #define SCSI_In_DBx__0__PC CYREG_PRT12_PC4 #define SCSI_In_DBx__0__PORT 12u @@ -795,6 +818,7 @@ #define SCSI_In_DBx__1__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__1__DR CYREG_PRT2_DR #define SCSI_In_DBx__1__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__1__INTTYPE CYREG_PICU2_INTTYPE7 #define SCSI_In_DBx__1__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__1__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__1__MASK 0x80u @@ -822,6 +846,7 @@ #define SCSI_In_DBx__2__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__2__DR CYREG_PRT2_DR #define SCSI_In_DBx__2__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__2__INTTYPE CYREG_PICU2_INTTYPE6 #define SCSI_In_DBx__2__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__2__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__2__MASK 0x40u @@ -849,6 +874,7 @@ #define SCSI_In_DBx__3__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__3__DR CYREG_PRT2_DR #define SCSI_In_DBx__3__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__3__INTTYPE CYREG_PICU2_INTTYPE5 #define SCSI_In_DBx__3__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__3__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__3__MASK 0x20u @@ -876,6 +902,7 @@ #define SCSI_In_DBx__4__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__4__DR CYREG_PRT2_DR #define SCSI_In_DBx__4__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__4__INTTYPE CYREG_PICU2_INTTYPE4 #define SCSI_In_DBx__4__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__4__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__4__MASK 0x10u @@ -903,6 +930,7 @@ #define SCSI_In_DBx__5__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__5__DR CYREG_PRT2_DR #define SCSI_In_DBx__5__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__5__INTTYPE CYREG_PICU2_INTTYPE3 #define SCSI_In_DBx__5__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__5__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__5__MASK 0x08u @@ -930,6 +958,7 @@ #define SCSI_In_DBx__6__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__6__DR CYREG_PRT2_DR #define SCSI_In_DBx__6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__6__INTTYPE CYREG_PICU2_INTTYPE2 #define SCSI_In_DBx__6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__6__MASK 0x04u @@ -957,6 +986,7 @@ #define SCSI_In_DBx__7__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__7__DR CYREG_PRT2_DR #define SCSI_In_DBx__7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__7__INTTYPE CYREG_PICU2_INTTYPE1 #define SCSI_In_DBx__7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__7__MASK 0x02u @@ -982,6 +1012,7 @@ #define SCSI_In_DBx__DB0__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__DB0__DR CYREG_PRT12_DR #define SCSI_In_DBx__DB0__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__DB0__INTTYPE CYREG_PICU12_INTTYPE4 #define SCSI_In_DBx__DB0__MASK 0x10u #define SCSI_In_DBx__DB0__PC CYREG_PRT12_PC4 #define SCSI_In_DBx__DB0__PORT 12u @@ -1010,6 +1041,7 @@ #define SCSI_In_DBx__DB1__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB1__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB1__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB1__INTTYPE CYREG_PICU2_INTTYPE7 #define SCSI_In_DBx__DB1__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB1__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB1__MASK 0x80u @@ -1037,6 +1069,7 @@ #define SCSI_In_DBx__DB2__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB2__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB2__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB2__INTTYPE CYREG_PICU2_INTTYPE6 #define SCSI_In_DBx__DB2__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB2__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB2__MASK 0x40u @@ -1064,6 +1097,7 @@ #define SCSI_In_DBx__DB3__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB3__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB3__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB3__INTTYPE CYREG_PICU2_INTTYPE5 #define SCSI_In_DBx__DB3__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB3__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB3__MASK 0x20u @@ -1091,6 +1125,7 @@ #define SCSI_In_DBx__DB4__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB4__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB4__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB4__INTTYPE CYREG_PICU2_INTTYPE4 #define SCSI_In_DBx__DB4__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB4__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB4__MASK 0x10u @@ -1118,6 +1153,7 @@ #define SCSI_In_DBx__DB5__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB5__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB5__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB5__INTTYPE CYREG_PICU2_INTTYPE3 #define SCSI_In_DBx__DB5__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB5__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB5__MASK 0x08u @@ -1145,6 +1181,7 @@ #define SCSI_In_DBx__DB6__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB6__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB6__INTTYPE CYREG_PICU2_INTTYPE2 #define SCSI_In_DBx__DB6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB6__MASK 0x04u @@ -1172,6 +1209,7 @@ #define SCSI_In_DBx__DB7__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB7__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB7__INTTYPE CYREG_PICU2_INTTYPE1 #define SCSI_In_DBx__DB7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB7__MASK 0x02u @@ -1190,6 +1228,7 @@ #define SCSI_In_DBx__DB7__SLW CYREG_PRT2_SLW /* SD_DAT1 */ +#define SD_DAT1__0__INTTYPE CYREG_PICU3_INTTYPE0 #define SD_DAT1__0__MASK 0x01u #define SD_DAT1__0__PC CYREG_PRT3_PC0 #define SD_DAT1__0__PORT 3u @@ -1205,6 +1244,7 @@ #define SD_DAT1__DM2 CYREG_PRT3_DM2 #define SD_DAT1__DR CYREG_PRT3_DR #define SD_DAT1__INP_DIS CYREG_PRT3_INP_DIS +#define SD_DAT1__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_DAT1__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_DAT1__LCD_EN CYREG_PRT3_LCD_EN #define SD_DAT1__MASK 0x01u @@ -1222,6 +1262,7 @@ #define SD_DAT1__SLW CYREG_PRT3_SLW /* SD_DAT2 */ +#define SD_DAT2__0__INTTYPE CYREG_PICU3_INTTYPE5 #define SD_DAT2__0__MASK 0x20u #define SD_DAT2__0__PC CYREG_PRT3_PC5 #define SD_DAT2__0__PORT 3u @@ -1237,6 +1278,7 @@ #define SD_DAT2__DM2 CYREG_PRT3_DM2 #define SD_DAT2__DR CYREG_PRT3_DR #define SD_DAT2__INP_DIS CYREG_PRT3_INP_DIS +#define SD_DAT2__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_DAT2__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_DAT2__LCD_EN CYREG_PRT3_LCD_EN #define SD_DAT2__MASK 0x20u @@ -1254,6 +1296,7 @@ #define SD_DAT2__SLW CYREG_PRT3_SLW /* SD_MISO */ +#define SD_MISO__0__INTTYPE CYREG_PICU3_INTTYPE1 #define SD_MISO__0__MASK 0x02u #define SD_MISO__0__PC CYREG_PRT3_PC1 #define SD_MISO__0__PORT 3u @@ -1269,6 +1312,7 @@ #define SD_MISO__DM2 CYREG_PRT3_DM2 #define SD_MISO__DR CYREG_PRT3_DR #define SD_MISO__INP_DIS CYREG_PRT3_INP_DIS +#define SD_MISO__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_MISO__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_MISO__LCD_EN CYREG_PRT3_LCD_EN #define SD_MISO__MASK 0x02u @@ -1286,6 +1330,7 @@ #define SD_MISO__SLW CYREG_PRT3_SLW /* SD_MOSI */ +#define SD_MOSI__0__INTTYPE CYREG_PICU3_INTTYPE3 #define SD_MOSI__0__MASK 0x08u #define SD_MOSI__0__PC CYREG_PRT3_PC3 #define SD_MOSI__0__PORT 3u @@ -1301,6 +1346,7 @@ #define SD_MOSI__DM2 CYREG_PRT3_DM2 #define SD_MOSI__DR CYREG_PRT3_DR #define SD_MOSI__INP_DIS CYREG_PRT3_INP_DIS +#define SD_MOSI__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_MOSI__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_MOSI__LCD_EN CYREG_PRT3_LCD_EN #define SD_MOSI__MASK 0x08u @@ -1340,6 +1386,7 @@ #define SCSI_Out__0__DM2 CYREG_PRT4_DM2 #define SCSI_Out__0__DR CYREG_PRT4_DR #define SCSI_Out__0__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__0__INTTYPE CYREG_PICU4_INTTYPE3 #define SCSI_Out__0__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__0__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__0__MASK 0x08u @@ -1367,6 +1414,7 @@ #define SCSI_Out__1__DM2 CYREG_PRT4_DM2 #define SCSI_Out__1__DR CYREG_PRT4_DR #define SCSI_Out__1__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__1__INTTYPE CYREG_PICU4_INTTYPE2 #define SCSI_Out__1__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__1__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__1__MASK 0x04u @@ -1394,6 +1442,7 @@ #define SCSI_Out__2__DM2 CYREG_PRT0_DM2 #define SCSI_Out__2__DR CYREG_PRT0_DR #define SCSI_Out__2__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__2__INTTYPE CYREG_PICU0_INTTYPE7 #define SCSI_Out__2__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__2__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__2__MASK 0x80u @@ -1421,6 +1470,7 @@ #define SCSI_Out__3__DM2 CYREG_PRT0_DM2 #define SCSI_Out__3__DR CYREG_PRT0_DR #define SCSI_Out__3__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__3__INTTYPE CYREG_PICU0_INTTYPE6 #define SCSI_Out__3__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__3__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__3__MASK 0x40u @@ -1448,6 +1498,7 @@ #define SCSI_Out__4__DM2 CYREG_PRT0_DM2 #define SCSI_Out__4__DR CYREG_PRT0_DR #define SCSI_Out__4__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__4__INTTYPE CYREG_PICU0_INTTYPE5 #define SCSI_Out__4__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__4__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__4__MASK 0x20u @@ -1475,6 +1526,7 @@ #define SCSI_Out__5__DM2 CYREG_PRT0_DM2 #define SCSI_Out__5__DR CYREG_PRT0_DR #define SCSI_Out__5__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__5__INTTYPE CYREG_PICU0_INTTYPE4 #define SCSI_Out__5__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__5__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__5__MASK 0x10u @@ -1502,6 +1554,7 @@ #define SCSI_Out__6__DM2 CYREG_PRT0_DM2 #define SCSI_Out__6__DR CYREG_PRT0_DR #define SCSI_Out__6__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__6__INTTYPE CYREG_PICU0_INTTYPE3 #define SCSI_Out__6__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__6__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__6__MASK 0x08u @@ -1529,6 +1582,7 @@ #define SCSI_Out__7__DM2 CYREG_PRT0_DM2 #define SCSI_Out__7__DR CYREG_PRT0_DR #define SCSI_Out__7__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__7__INTTYPE CYREG_PICU0_INTTYPE2 #define SCSI_Out__7__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__7__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__7__MASK 0x04u @@ -1556,6 +1610,7 @@ #define SCSI_Out__8__DM2 CYREG_PRT0_DM2 #define SCSI_Out__8__DR CYREG_PRT0_DR #define SCSI_Out__8__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__8__INTTYPE CYREG_PICU0_INTTYPE1 #define SCSI_Out__8__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__8__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__8__MASK 0x02u @@ -1583,6 +1638,7 @@ #define SCSI_Out__9__DM2 CYREG_PRT0_DM2 #define SCSI_Out__9__DR CYREG_PRT0_DR #define SCSI_Out__9__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__9__INTTYPE CYREG_PICU0_INTTYPE0 #define SCSI_Out__9__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__9__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__9__MASK 0x01u @@ -1610,6 +1666,7 @@ #define SCSI_Out__ACK__DM2 CYREG_PRT0_DM2 #define SCSI_Out__ACK__DR CYREG_PRT0_DR #define SCSI_Out__ACK__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__ACK__INTTYPE CYREG_PICU0_INTTYPE6 #define SCSI_Out__ACK__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__ACK__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__ACK__MASK 0x40u @@ -1637,6 +1694,7 @@ #define SCSI_Out__ATN__DM2 CYREG_PRT4_DM2 #define SCSI_Out__ATN__DR CYREG_PRT4_DR #define SCSI_Out__ATN__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__ATN__INTTYPE CYREG_PICU4_INTTYPE2 #define SCSI_Out__ATN__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__ATN__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__ATN__MASK 0x04u @@ -1664,6 +1722,7 @@ #define SCSI_Out__BSY__DM2 CYREG_PRT0_DM2 #define SCSI_Out__BSY__DR CYREG_PRT0_DR #define SCSI_Out__BSY__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__BSY__INTTYPE CYREG_PICU0_INTTYPE7 #define SCSI_Out__BSY__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__BSY__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__BSY__MASK 0x80u @@ -1691,6 +1750,7 @@ #define SCSI_Out__CD_raw__DM2 CYREG_PRT0_DM2 #define SCSI_Out__CD_raw__DR CYREG_PRT0_DR #define SCSI_Out__CD_raw__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__CD_raw__INTTYPE CYREG_PICU0_INTTYPE2 #define SCSI_Out__CD_raw__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__CD_raw__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__CD_raw__MASK 0x04u @@ -1718,6 +1778,7 @@ #define SCSI_Out__DBP_raw__DM2 CYREG_PRT4_DM2 #define SCSI_Out__DBP_raw__DR CYREG_PRT4_DR #define SCSI_Out__DBP_raw__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__DBP_raw__INTTYPE CYREG_PICU4_INTTYPE3 #define SCSI_Out__DBP_raw__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__DBP_raw__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__DBP_raw__MASK 0x08u @@ -1745,6 +1806,7 @@ #define SCSI_Out__IO_raw__DM2 CYREG_PRT0_DM2 #define SCSI_Out__IO_raw__DR CYREG_PRT0_DR #define SCSI_Out__IO_raw__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__IO_raw__INTTYPE CYREG_PICU0_INTTYPE0 #define SCSI_Out__IO_raw__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__IO_raw__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__IO_raw__MASK 0x01u @@ -1772,6 +1834,7 @@ #define SCSI_Out__MSG_raw__DM2 CYREG_PRT0_DM2 #define SCSI_Out__MSG_raw__DR CYREG_PRT0_DR #define SCSI_Out__MSG_raw__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__MSG_raw__INTTYPE CYREG_PICU0_INTTYPE4 #define SCSI_Out__MSG_raw__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__MSG_raw__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__MSG_raw__MASK 0x10u @@ -1799,6 +1862,7 @@ #define SCSI_Out__REQ__DM2 CYREG_PRT0_DM2 #define SCSI_Out__REQ__DR CYREG_PRT0_DR #define SCSI_Out__REQ__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__REQ__INTTYPE CYREG_PICU0_INTTYPE1 #define SCSI_Out__REQ__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__REQ__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__REQ__MASK 0x02u @@ -1826,6 +1890,7 @@ #define SCSI_Out__RST__DM2 CYREG_PRT0_DM2 #define SCSI_Out__RST__DR CYREG_PRT0_DR #define SCSI_Out__RST__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__RST__INTTYPE CYREG_PICU0_INTTYPE5 #define SCSI_Out__RST__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__RST__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__RST__MASK 0x20u @@ -1853,6 +1918,7 @@ #define SCSI_Out__SEL__DM2 CYREG_PRT0_DM2 #define SCSI_Out__SEL__DR CYREG_PRT0_DR #define SCSI_Out__SEL__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__SEL__INTTYPE CYREG_PICU0_INTTYPE3 #define SCSI_Out__SEL__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__SEL__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__SEL__MASK 0x08u @@ -1875,15 +1941,15 @@ #define SCSI_Out_Bits_Sync_ctrl_reg__0__POS 0 #define SCSI_Out_Bits_Sync_ctrl_reg__1__MASK 0x02u #define SCSI_Out_Bits_Sync_ctrl_reg__1__POS 1 -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB11_12_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB11_12_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB11_12_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB11_12_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB11_12_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB11_12_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB11_12_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB11_12_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB11_12_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B1_UDB05_06_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B1_UDB05_06_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B1_UDB05_06_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B1_UDB05_06_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B1_UDB05_06_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B1_UDB05_06_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B1_UDB05_06_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B1_UDB05_06_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B1_UDB05_06_MSK #define SCSI_Out_Bits_Sync_ctrl_reg__2__MASK 0x04u #define SCSI_Out_Bits_Sync_ctrl_reg__2__POS 2 #define SCSI_Out_Bits_Sync_ctrl_reg__3__MASK 0x08u @@ -1896,28 +1962,37 @@ #define SCSI_Out_Bits_Sync_ctrl_reg__6__POS 6 #define SCSI_Out_Bits_Sync_ctrl_reg__7__MASK 0x80u #define SCSI_Out_Bits_Sync_ctrl_reg__7__POS 7 -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB11_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB11_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB11_ST_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB11_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB11_ST_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B1_UDB05_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG CYREG_B1_UDB05_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B1_UDB05_ST_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG CYREG_B1_UDB05_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG CYREG_B1_UDB05_ST_CTL #define SCSI_Out_Bits_Sync_ctrl_reg__MASK 0xFFu -#define SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB11_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B1_UDB05_MSK_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG CYREG_B1_UDB05_MSK /* SCSI_Out_Ctl */ #define SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_Out_Ctl_Sync_ctrl_reg__0__POS 0 -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB15_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB15_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB15_ST_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB15_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB15_ST_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB05_06_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB05_06_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB05_06_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB05_06_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB05_06_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB05_06_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB05_06_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB05_06_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB05_06_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB05_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB05_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB05_ST_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB05_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB05_ST_CTL #define SCSI_Out_Ctl_Sync_ctrl_reg__MASK 0x01u -#define SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB15_MSK_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB15_MSK_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB15_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB05_MSK_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB05_MSK_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB05_MSK /* SCSI_Out_DBx */ #define SCSI_Out_DBx__0__AG CYREG_PRT6_AG @@ -1931,6 +2006,7 @@ #define SCSI_Out_DBx__0__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__0__DR CYREG_PRT6_DR #define SCSI_Out_DBx__0__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__0__INTTYPE CYREG_PICU6_INTTYPE3 #define SCSI_Out_DBx__0__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__0__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__0__MASK 0x08u @@ -1958,6 +2034,7 @@ #define SCSI_Out_DBx__1__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__1__DR CYREG_PRT6_DR #define SCSI_Out_DBx__1__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__1__INTTYPE CYREG_PICU6_INTTYPE2 #define SCSI_Out_DBx__1__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__1__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__1__MASK 0x04u @@ -1985,6 +2062,7 @@ #define SCSI_Out_DBx__2__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__2__DR CYREG_PRT6_DR #define SCSI_Out_DBx__2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__2__INTTYPE CYREG_PICU6_INTTYPE1 #define SCSI_Out_DBx__2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__2__MASK 0x02u @@ -2012,6 +2090,7 @@ #define SCSI_Out_DBx__3__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__3__DR CYREG_PRT6_DR #define SCSI_Out_DBx__3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__3__INTTYPE CYREG_PICU6_INTTYPE0 #define SCSI_Out_DBx__3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__3__MASK 0x01u @@ -2039,6 +2118,7 @@ #define SCSI_Out_DBx__4__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__4__DR CYREG_PRT4_DR #define SCSI_Out_DBx__4__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__4__INTTYPE CYREG_PICU4_INTTYPE7 #define SCSI_Out_DBx__4__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__4__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__4__MASK 0x80u @@ -2066,6 +2146,7 @@ #define SCSI_Out_DBx__5__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__5__DR CYREG_PRT4_DR #define SCSI_Out_DBx__5__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__5__INTTYPE CYREG_PICU4_INTTYPE6 #define SCSI_Out_DBx__5__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__5__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__5__MASK 0x40u @@ -2093,6 +2174,7 @@ #define SCSI_Out_DBx__6__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__6__DR CYREG_PRT4_DR #define SCSI_Out_DBx__6__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__6__INTTYPE CYREG_PICU4_INTTYPE5 #define SCSI_Out_DBx__6__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__6__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__6__MASK 0x20u @@ -2120,6 +2202,7 @@ #define SCSI_Out_DBx__7__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__7__DR CYREG_PRT4_DR #define SCSI_Out_DBx__7__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__7__INTTYPE CYREG_PICU4_INTTYPE4 #define SCSI_Out_DBx__7__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__7__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__7__MASK 0x10u @@ -2147,6 +2230,7 @@ #define SCSI_Out_DBx__DB0__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB0__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB0__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB0__INTTYPE CYREG_PICU6_INTTYPE3 #define SCSI_Out_DBx__DB0__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB0__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB0__MASK 0x08u @@ -2174,6 +2258,7 @@ #define SCSI_Out_DBx__DB1__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB1__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB1__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB1__INTTYPE CYREG_PICU6_INTTYPE2 #define SCSI_Out_DBx__DB1__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB1__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB1__MASK 0x04u @@ -2201,6 +2286,7 @@ #define SCSI_Out_DBx__DB2__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB2__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB2__INTTYPE CYREG_PICU6_INTTYPE1 #define SCSI_Out_DBx__DB2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB2__MASK 0x02u @@ -2228,6 +2314,7 @@ #define SCSI_Out_DBx__DB3__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB3__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB3__INTTYPE CYREG_PICU6_INTTYPE0 #define SCSI_Out_DBx__DB3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB3__MASK 0x01u @@ -2255,6 +2342,7 @@ #define SCSI_Out_DBx__DB4__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__DB4__DR CYREG_PRT4_DR #define SCSI_Out_DBx__DB4__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__DB4__INTTYPE CYREG_PICU4_INTTYPE7 #define SCSI_Out_DBx__DB4__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__DB4__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__DB4__MASK 0x80u @@ -2282,6 +2370,7 @@ #define SCSI_Out_DBx__DB5__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__DB5__DR CYREG_PRT4_DR #define SCSI_Out_DBx__DB5__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__DB5__INTTYPE CYREG_PICU4_INTTYPE6 #define SCSI_Out_DBx__DB5__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__DB5__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__DB5__MASK 0x40u @@ -2309,6 +2398,7 @@ #define SCSI_Out_DBx__DB6__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__DB6__DR CYREG_PRT4_DR #define SCSI_Out_DBx__DB6__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__DB6__INTTYPE CYREG_PICU4_INTTYPE5 #define SCSI_Out_DBx__DB6__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__DB6__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__DB6__MASK 0x20u @@ -2336,6 +2426,7 @@ #define SCSI_Out_DBx__DB7__DM2 CYREG_PRT4_DM2 #define SCSI_Out_DBx__DB7__DR CYREG_PRT4_DR #define SCSI_Out_DBx__DB7__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out_DBx__DB7__INTTYPE CYREG_PICU4_INTTYPE4 #define SCSI_Out_DBx__DB7__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out_DBx__DB7__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out_DBx__DB7__MASK 0x10u @@ -2407,6 +2498,7 @@ #define SCSI_Noise__0__DM2 CYREG_PRT12_DM2 #define SCSI_Noise__0__DR CYREG_PRT12_DR #define SCSI_Noise__0__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_Noise__0__INTTYPE CYREG_PICU12_INTTYPE5 #define SCSI_Noise__0__MASK 0x20u #define SCSI_Noise__0__PC CYREG_PRT12_PC5 #define SCSI_Noise__0__PORT 12u @@ -2435,6 +2527,7 @@ #define SCSI_Noise__1__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__1__DR CYREG_PRT6_DR #define SCSI_Noise__1__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__1__INTTYPE CYREG_PICU6_INTTYPE4 #define SCSI_Noise__1__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__1__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__1__MASK 0x10u @@ -2462,6 +2555,7 @@ #define SCSI_Noise__2__DM2 CYREG_PRT5_DM2 #define SCSI_Noise__2__DR CYREG_PRT5_DR #define SCSI_Noise__2__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Noise__2__INTTYPE CYREG_PICU5_INTTYPE0 #define SCSI_Noise__2__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Noise__2__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Noise__2__MASK 0x01u @@ -2489,6 +2583,7 @@ #define SCSI_Noise__3__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__3__DR CYREG_PRT6_DR #define SCSI_Noise__3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__3__INTTYPE CYREG_PICU6_INTTYPE6 #define SCSI_Noise__3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__3__MASK 0x40u @@ -2516,6 +2611,7 @@ #define SCSI_Noise__4__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__4__DR CYREG_PRT6_DR #define SCSI_Noise__4__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__4__INTTYPE CYREG_PICU6_INTTYPE5 #define SCSI_Noise__4__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__4__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__4__MASK 0x20u @@ -2543,6 +2639,7 @@ #define SCSI_Noise__ACK__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__ACK__DR CYREG_PRT6_DR #define SCSI_Noise__ACK__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__ACK__INTTYPE CYREG_PICU6_INTTYPE5 #define SCSI_Noise__ACK__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__ACK__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__ACK__MASK 0x20u @@ -2568,6 +2665,7 @@ #define SCSI_Noise__ATN__DM2 CYREG_PRT12_DM2 #define SCSI_Noise__ATN__DR CYREG_PRT12_DR #define SCSI_Noise__ATN__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_Noise__ATN__INTTYPE CYREG_PICU12_INTTYPE5 #define SCSI_Noise__ATN__MASK 0x20u #define SCSI_Noise__ATN__PC CYREG_PRT12_PC5 #define SCSI_Noise__ATN__PORT 12u @@ -2596,6 +2694,7 @@ #define SCSI_Noise__BSY__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__BSY__DR CYREG_PRT6_DR #define SCSI_Noise__BSY__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__BSY__INTTYPE CYREG_PICU6_INTTYPE4 #define SCSI_Noise__BSY__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__BSY__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__BSY__MASK 0x10u @@ -2623,6 +2722,7 @@ #define SCSI_Noise__RST__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__RST__DR CYREG_PRT6_DR #define SCSI_Noise__RST__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__RST__INTTYPE CYREG_PICU6_INTTYPE6 #define SCSI_Noise__RST__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__RST__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__RST__MASK 0x40u @@ -2650,6 +2750,7 @@ #define SCSI_Noise__SEL__DM2 CYREG_PRT5_DM2 #define SCSI_Noise__SEL__DR CYREG_PRT5_DR #define SCSI_Noise__SEL__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Noise__SEL__INTTYPE CYREG_PICU5_INTTYPE0 #define SCSI_Noise__SEL__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Noise__SEL__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Noise__SEL__MASK 0x01u @@ -2727,11 +2828,7 @@ #define scsiTarget_StatusReg__4__POS 4 #define scsiTarget_StatusReg__MASK 0x1Fu #define scsiTarget_StatusReg__MASK_REG CYREG_B0_UDB02_MSK -#define scsiTarget_StatusReg__MASK_ST_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL -#define scsiTarget_StatusReg__PER_ST_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL #define scsiTarget_StatusReg__STATUS_AUX_CTL_REG CYREG_B0_UDB02_ACTL -#define scsiTarget_StatusReg__STATUS_CNT_REG CYREG_B0_UDB02_ST_CTL -#define scsiTarget_StatusReg__STATUS_CONTROL_REG CYREG_B0_UDB02_ST_CTL #define scsiTarget_StatusReg__STATUS_REG CYREG_B0_UDB02_ST /* Debug_Timer_Interrupt */ @@ -2853,8 +2950,8 @@ #define SCSI_Filtered_sts_sts_reg__0__POS 0 #define SCSI_Filtered_sts_sts_reg__1__MASK 0x02u #define SCSI_Filtered_sts_sts_reg__1__POS 1 -#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB10_11_ACTL -#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB10_11_ST +#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB01_02_ACTL +#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB01_02_ST #define SCSI_Filtered_sts_sts_reg__2__MASK 0x04u #define SCSI_Filtered_sts_sts_reg__2__POS 2 #define SCSI_Filtered_sts_sts_reg__3__MASK 0x08u @@ -2862,83 +2959,79 @@ #define SCSI_Filtered_sts_sts_reg__4__MASK 0x10u #define SCSI_Filtered_sts_sts_reg__4__POS 4 #define SCSI_Filtered_sts_sts_reg__MASK 0x1Fu -#define SCSI_Filtered_sts_sts_reg__MASK_REG CYREG_B0_UDB10_MSK -#define SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB10_ACTL -#define SCSI_Filtered_sts_sts_reg__STATUS_REG CYREG_B0_UDB10_ST +#define SCSI_Filtered_sts_sts_reg__MASK_REG CYREG_B0_UDB01_MSK +#define SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB01_ACTL +#define SCSI_Filtered_sts_sts_reg__STATUS_REG CYREG_B0_UDB01_ST /* SCSI_CTL_PHASE */ #define SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS 0 #define SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK 0x02u #define SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS 1 -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB02_03_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB02_03_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB02_03_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB02_03_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB02_03_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB02_03_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB02_03_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB02_03_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB02_03_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB11_12_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB11_12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB11_12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB11_12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB11_12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB11_12_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB11_12_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB11_12_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB11_12_MSK #define SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK 0x04u #define SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS 2 -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB02_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB02_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB02_ST_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB02_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB02_ST_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB11_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB11_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB11_ST_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB11_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB11_ST_CTL #define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK 0x07u -#define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB02_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB11_MSK /* SCSI_Glitch_Ctl */ #define SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS 0 -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB04_05_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB04_05_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB04_05_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB04_05_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB04_05_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB04_05_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB04_05_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB04_05_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB04_05_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB04_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB04_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB04_ST_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB04_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB04_ST_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB10_11_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB10_11_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB10_11_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB10_11_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB10_11_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB10_11_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB10_11_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB10_11_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB10_11_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB10_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB10_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB10_ST_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB10_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB10_ST_CTL #define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK 0x01u -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB04_MSK_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB04_MSK_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB04_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB10_MSK_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB10_MSK_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB10_MSK /* SCSI_Parity_Error */ #define SCSI_Parity_Error_sts_sts_reg__0__MASK 0x01u #define SCSI_Parity_Error_sts_sts_reg__0__POS 0 -#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB11_12_ACTL -#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB11_12_ST +#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB04_05_ACTL +#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB04_05_ST #define SCSI_Parity_Error_sts_sts_reg__MASK 0x01u -#define SCSI_Parity_Error_sts_sts_reg__MASK_REG CYREG_B0_UDB11_MSK -#define SCSI_Parity_Error_sts_sts_reg__MASK_ST_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL -#define SCSI_Parity_Error_sts_sts_reg__PER_ST_AUX_CTL_REG CYREG_B0_UDB11_MSK_ACTL -#define SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB11_ACTL -#define SCSI_Parity_Error_sts_sts_reg__STATUS_CNT_REG CYREG_B0_UDB11_ST_CTL -#define SCSI_Parity_Error_sts_sts_reg__STATUS_CONTROL_REG CYREG_B0_UDB11_ST_CTL -#define SCSI_Parity_Error_sts_sts_reg__STATUS_REG CYREG_B0_UDB11_ST +#define SCSI_Parity_Error_sts_sts_reg__MASK_REG CYREG_B0_UDB04_MSK +#define SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB04_ACTL +#define SCSI_Parity_Error_sts_sts_reg__STATUS_REG CYREG_B0_UDB04_ST /* Miscellaneous */ #define BCLK__BUS_CLK__HZ 50000000U #define BCLK__BUS_CLK__KHZ 50000U #define BCLK__BUS_CLK__MHZ 50U #define CY_PROJECT_NAME "SCSI2SD" -#define CY_VERSION "PSoC Creator 3.2" -#define CYDEV_CHIP_DIE_GEN4 2u +#define CY_VERSION "PSoC Creator 3.3" #define CYDEV_CHIP_DIE_LEOPARD 1u -#define CYDEV_CHIP_DIE_PANTHER 12u -#define CYDEV_CHIP_DIE_PSOC4A 5u -#define CYDEV_CHIP_DIE_PSOC5LP 11u +#define CYDEV_CHIP_DIE_PANTHER 18u +#define CYDEV_CHIP_DIE_PSOC4A 10u +#define CYDEV_CHIP_DIE_PSOC5LP 17u +#define CYDEV_CHIP_DIE_TMA4 2u #define CYDEV_CHIP_DIE_UNKNOWN 0u #define CYDEV_CHIP_FAMILY_PSOC3 1u #define CYDEV_CHIP_FAMILY_PSOC4 2u @@ -2947,23 +3040,26 @@ #define CYDEV_CHIP_FAMILY_USED CYDEV_CHIP_FAMILY_PSOC5 #define CYDEV_CHIP_JTAG_ID 0x2E133069u #define CYDEV_CHIP_MEMBER_3A 1u -#define CYDEV_CHIP_MEMBER_4A 5u -#define CYDEV_CHIP_MEMBER_4C 9u -#define CYDEV_CHIP_MEMBER_4D 3u +#define CYDEV_CHIP_MEMBER_4A 10u +#define CYDEV_CHIP_MEMBER_4C 15u +#define CYDEV_CHIP_MEMBER_4D 6u #define CYDEV_CHIP_MEMBER_4E 4u -#define CYDEV_CHIP_MEMBER_4F 6u +#define CYDEV_CHIP_MEMBER_4F 11u #define CYDEV_CHIP_MEMBER_4G 2u -#define CYDEV_CHIP_MEMBER_4L 8u -#define CYDEV_CHIP_MEMBER_4M 7u -#define CYDEV_CHIP_MEMBER_5A 11u -#define CYDEV_CHIP_MEMBER_5B 10u +#define CYDEV_CHIP_MEMBER_4H 9u +#define CYDEV_CHIP_MEMBER_4I 14u +#define CYDEV_CHIP_MEMBER_4J 7u +#define CYDEV_CHIP_MEMBER_4K 8u +#define CYDEV_CHIP_MEMBER_4L 13u +#define CYDEV_CHIP_MEMBER_4M 12u +#define CYDEV_CHIP_MEMBER_4N 5u +#define CYDEV_CHIP_MEMBER_4U 3u +#define CYDEV_CHIP_MEMBER_5A 17u +#define CYDEV_CHIP_MEMBER_5B 16u #define CYDEV_CHIP_MEMBER_UNKNOWN 0u #define CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_MEMBER_5B #define CYDEV_CHIP_DIE_EXPECT CYDEV_CHIP_MEMBER_USED #define CYDEV_CHIP_DIE_ACTUAL CYDEV_CHIP_DIE_EXPECT -#define CYDEV_CHIP_REV_GEN4_ES 17u -#define CYDEV_CHIP_REV_GEN4_ES2 33u -#define CYDEV_CHIP_REV_GEN4_PRODUCTION 17u #define CYDEV_CHIP_REV_LEOPARD_ES1 0u #define CYDEV_CHIP_REV_LEOPARD_ES2 1u #define CYDEV_CHIP_REV_LEOPARD_ES3 3u @@ -2975,6 +3071,9 @@ #define CYDEV_CHIP_REV_PSOC4A_PRODUCTION 17u #define CYDEV_CHIP_REV_PSOC5LP_ES0 0u #define CYDEV_CHIP_REV_PSOC5LP_PRODUCTION 0u +#define CYDEV_CHIP_REV_TMA4_ES 17u +#define CYDEV_CHIP_REV_TMA4_ES2 33u +#define CYDEV_CHIP_REV_TMA4_PRODUCTION 17u #define CYDEV_CHIP_REVISION_3A_ES1 0u #define CYDEV_CHIP_REVISION_3A_ES2 1u #define CYDEV_CHIP_REVISION_3A_ES3 3u @@ -2985,12 +3084,19 @@ #define CYDEV_CHIP_REVISION_4D_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4E_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4F_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA 0u #define CYDEV_CHIP_REVISION_4F_PRODUCTION_256K 0u #define CYDEV_CHIP_REVISION_4G_ES 17u #define CYDEV_CHIP_REVISION_4G_ES2 33u #define CYDEV_CHIP_REVISION_4G_PRODUCTION 17u +#define CYDEV_CHIP_REVISION_4H_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4I_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4J_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4K_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4L_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4M_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4N_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4U_PRODUCTION 0u #define CYDEV_CHIP_REVISION_5A_ES0 0u #define CYDEV_CHIP_REVISION_5A_ES1 1u #define CYDEV_CHIP_REVISION_5A_PRODUCTION 1u @@ -3023,6 +3129,8 @@ #define CYDEV_HEAP_SIZE 0x0400 #define CYDEV_INSTRUCT_CACHE_ENABLED 1 #define CYDEV_INTR_RISING 0x0000007Eu +#define CYDEV_IS_EXPORTING_CODE 0 +#define CYDEV_IS_IMPORTING_CODE 0 #define CYDEV_PROJ_TYPE 2 #define CYDEV_PROJ_TYPE_BOOTLOADER 1 #define CYDEV_PROJ_TYPE_LAUNCHER 5 diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c index 355ae624..815d6a91 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cyfitter_cfg.c +* File Name: cyfitter_cfg.c * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file contains device initialization code. * Except for the user defined sections in CyClockStartupError(), this file should not be modified. * This file is automatically generated by PSoC Creator. @@ -122,7 +122,7 @@ static void CyClockStartupError(uint8 errorCode) } #endif -#define CY_CFG_BASE_ADDR_COUNT 42u +#define CY_CFG_BASE_ADDR_COUNT 41u CYPACKED typedef struct { uint8 offset; @@ -190,8 +190,8 @@ static void ClockSetup(void) /* Configure Digital Clocks based on settings from Clock DWR */ CY_SET_XTND_REG16((void CYFAR *)(CYREG_CLKDIST_DCFG0_CFG0), 0x0000u); CY_SET_XTND_REG8((void CYFAR *)(CYREG_CLKDIST_DCFG0_CFG0 + 0x2u), 0x58u); - CY_SET_XTND_REG16((void CYFAR *)(CYREG_CLKDIST_DCFG1_CFG0), 0x0000u); - CY_SET_XTND_REG8((void CYFAR *)(CYREG_CLKDIST_DCFG1_CFG0 + 0x2u), 0x58u); + CY_SET_XTND_REG16((void CYFAR *)(CYREG_CLKDIST_DCFG1_CFG0), 0x0001u); + CY_SET_XTND_REG8((void CYFAR *)(CYREG_CLKDIST_DCFG1_CFG0 + 0x2u), 0x18u); CY_SET_XTND_REG16((void CYFAR *)(CYREG_CLKDIST_DCFG2_CFG0), 0x0017u); CY_SET_XTND_REG8((void CYFAR *)(CYREG_CLKDIST_DCFG2_CFG0 + 0x2u), 0x19u); @@ -381,45 +381,44 @@ void cyfitter_cfg(void) static const uint32 CYCODE cy_cfg_addr_table[] = { 0x40004501u, /* Base address: 0x40004500 Count: 1 */ 0x40004F02u, /* Base address: 0x40004F00 Count: 2 */ - 0x4000520Cu, /* Base address: 0x40005200 Count: 12 */ - 0x40006401u, /* Base address: 0x40006400 Count: 1 */ - 0x40006501u, /* Base address: 0x40006500 Count: 1 */ - 0x4001003Bu, /* Base address: 0x40010000 Count: 59 */ - 0x40010142u, /* Base address: 0x40010100 Count: 66 */ - 0x4001023Eu, /* Base address: 0x40010200 Count: 62 */ - 0x4001035Au, /* Base address: 0x40010300 Count: 90 */ - 0x40010447u, /* Base address: 0x40010400 Count: 71 */ - 0x4001054Fu, /* Base address: 0x40010500 Count: 79 */ - 0x4001064Au, /* Base address: 0x40010600 Count: 74 */ - 0x40010749u, /* Base address: 0x40010700 Count: 73 */ - 0x40010851u, /* Base address: 0x40010800 Count: 81 */ - 0x40010941u, /* Base address: 0x40010900 Count: 65 */ - 0x40010A43u, /* Base address: 0x40010A00 Count: 67 */ - 0x40010B4Au, /* Base address: 0x40010B00 Count: 74 */ - 0x40010C4Du, /* Base address: 0x40010C00 Count: 77 */ - 0x40010D4Bu, /* Base address: 0x40010D00 Count: 75 */ - 0x40010E44u, /* Base address: 0x40010E00 Count: 68 */ - 0x40010F3Cu, /* Base address: 0x40010F00 Count: 60 */ - 0x4001142Du, /* Base address: 0x40011400 Count: 45 */ - 0x4001154Du, /* Base address: 0x40011500 Count: 77 */ - 0x40011649u, /* Base address: 0x40011600 Count: 73 */ - 0x40011746u, /* Base address: 0x40011700 Count: 70 */ - 0x40011804u, /* Base address: 0x40011800 Count: 4 */ - 0x40011908u, /* Base address: 0x40011900 Count: 8 */ - 0x40011B03u, /* Base address: 0x40011B00 Count: 3 */ - 0x4001401Bu, /* Base address: 0x40014000 Count: 27 */ - 0x4001411Au, /* Base address: 0x40014100 Count: 26 */ - 0x40014211u, /* Base address: 0x40014200 Count: 17 */ - 0x4001430Bu, /* Base address: 0x40014300 Count: 11 */ - 0x4001440Fu, /* Base address: 0x40014400 Count: 15 */ - 0x4001451Cu, /* Base address: 0x40014500 Count: 28 */ - 0x4001460Cu, /* Base address: 0x40014600 Count: 12 */ - 0x4001470Cu, /* Base address: 0x40014700 Count: 12 */ - 0x4001480Cu, /* Base address: 0x40014800 Count: 12 */ - 0x4001490Bu, /* Base address: 0x40014900 Count: 11 */ + 0x4000520Bu, /* Base address: 0x40005200 Count: 11 */ + 0x40006402u, /* Base address: 0x40006400 Count: 2 */ + 0x40010037u, /* Base address: 0x40010000 Count: 55 */ + 0x4001013Cu, /* Base address: 0x40010100 Count: 60 */ + 0x40010245u, /* Base address: 0x40010200 Count: 69 */ + 0x40010356u, /* Base address: 0x40010300 Count: 86 */ + 0x40010455u, /* Base address: 0x40010400 Count: 85 */ + 0x40010555u, /* Base address: 0x40010500 Count: 85 */ + 0x4001064Bu, /* Base address: 0x40010600 Count: 75 */ + 0x40010756u, /* Base address: 0x40010700 Count: 86 */ + 0x40010922u, /* Base address: 0x40010900 Count: 34 */ + 0x40010A4Eu, /* Base address: 0x40010A00 Count: 78 */ + 0x40010B51u, /* Base address: 0x40010B00 Count: 81 */ + 0x40010C53u, /* Base address: 0x40010C00 Count: 83 */ + 0x40010D59u, /* Base address: 0x40010D00 Count: 89 */ + 0x40010E50u, /* Base address: 0x40010E00 Count: 80 */ + 0x40010F40u, /* Base address: 0x40010F00 Count: 64 */ + 0x40011454u, /* Base address: 0x40011400 Count: 84 */ + 0x40011548u, /* Base address: 0x40011500 Count: 72 */ + 0x4001164Fu, /* Base address: 0x40011600 Count: 79 */ + 0x4001174Au, /* Base address: 0x40011700 Count: 74 */ + 0x4001184Eu, /* Base address: 0x40011800 Count: 78 */ + 0x40011943u, /* Base address: 0x40011900 Count: 67 */ + 0x40011A04u, /* Base address: 0x40011A00 Count: 4 */ + 0x40011B0Fu, /* Base address: 0x40011B00 Count: 15 */ + 0x40014017u, /* Base address: 0x40014000 Count: 23 */ + 0x4001411Du, /* Base address: 0x40014100 Count: 29 */ + 0x40014215u, /* Base address: 0x40014200 Count: 21 */ + 0x4001430Eu, /* Base address: 0x40014300 Count: 14 */ + 0x4001440Eu, /* Base address: 0x40014400 Count: 14 */ + 0x40014514u, /* Base address: 0x40014500 Count: 20 */ + 0x40014610u, /* Base address: 0x40014600 Count: 16 */ + 0x40014710u, /* Base address: 0x40014700 Count: 16 */ + 0x40014809u, /* Base address: 0x40014800 Count: 9 */ + 0x4001490Cu, /* Base address: 0x40014900 Count: 12 */ 0x40014C01u, /* Base address: 0x40014C00 Count: 1 */ - 0x40014D04u, /* Base address: 0x40014D00 Count: 4 */ - 0x40015002u, /* Base address: 0x40015000 Count: 2 */ + 0x40014D05u, /* Base address: 0x40014D00 Count: 5 */ + 0x40015006u, /* Base address: 0x40015000 Count: 6 */ 0x40015104u, /* Base address: 0x40015100 Count: 4 */ }; @@ -427,61 +426,39 @@ void cyfitter_cfg(void) {0x7Eu, 0x02u}, {0x01u, 0x20u}, {0x0Au, 0x36u}, - {0x00u, 0x11u}, - {0x01u, 0x02u}, - {0x18u, 0x04u}, - {0x19u, 0x0Cu}, + {0x00u, 0x13u}, + {0x01u, 0x06u}, + {0x18u, 0x08u}, {0x1Cu, 0x71u}, - {0x20u, 0xA8u}, - {0x21u, 0x60u}, + {0x20u, 0xA0u}, + {0x21u, 0xC8u}, {0x2Cu, 0x0Eu}, - {0x30u, 0x0Au}, - {0x31u, 0x09u}, + {0x30u, 0x05u}, + {0x31u, 0x03u}, {0x34u, 0x80u}, {0x7Cu, 0x40u}, - {0x20u, 0x02u}, - {0x85u, 0x0Fu}, - {0x04u, 0x50u}, - {0x05u, 0x02u}, - {0x06u, 0x28u}, - {0x0Du, 0x01u}, - {0x0Eu, 0x38u}, - {0x10u, 0x02u}, - {0x14u, 0x48u}, - {0x15u, 0x08u}, - {0x16u, 0x10u}, - {0x17u, 0x04u}, - {0x18u, 0x04u}, - {0x19u, 0x04u}, - {0x1Bu, 0x08u}, - {0x1Cu, 0x20u}, - {0x1Du, 0x08u}, - {0x1Eu, 0x40u}, - {0x1Fu, 0x04u}, - {0x21u, 0x08u}, - {0x23u, 0x04u}, - {0x26u, 0x40u}, - {0x28u, 0x01u}, - {0x29u, 0x10u}, - {0x2Du, 0x08u}, - {0x2Fu, 0x04u}, - {0x30u, 0x04u}, - {0x31u, 0x10u}, - {0x32u, 0x01u}, - {0x33u, 0x02u}, - {0x34u, 0x02u}, - {0x35u, 0x0Cu}, - {0x36u, 0x78u}, - {0x37u, 0x01u}, - {0x3Bu, 0x20u}, - {0x3Eu, 0x15u}, - {0x3Fu, 0x45u}, - {0x40u, 0x62u}, - {0x41u, 0x03u}, - {0x42u, 0x40u}, + {0x20u, 0x01u}, + {0x87u, 0x0Fu}, + {0x06u, 0x07u}, + {0x08u, 0xAAu}, + {0x0Au, 0x55u}, + {0x0Cu, 0x99u}, + {0x0Eu, 0x22u}, + {0x10u, 0x44u}, + {0x12u, 0x88u}, + {0x17u, 0x01u}, + {0x1Au, 0x70u}, + {0x26u, 0x80u}, + {0x2Au, 0x08u}, + {0x31u, 0x01u}, + {0x32u, 0x0Fu}, + {0x34u, 0xF0u}, + {0x40u, 0x32u}, + {0x41u, 0x04u}, + {0x42u, 0x50u}, {0x45u, 0xEFu}, - {0x46u, 0x2Cu}, - {0x47u, 0x0Du}, + {0x46u, 0xDCu}, + {0x47u, 0x02u}, {0x48u, 0x1Fu}, {0x49u, 0xFFu}, {0x4Au, 0xFFu}, @@ -495,132 +472,150 @@ void cyfitter_cfg(void) {0x5Cu, 0x91u}, {0x5Du, 0x01u}, {0x5Fu, 0x01u}, - {0x62u, 0xC0u}, + {0x60u, 0x08u}, + {0x62u, 0xC8u}, {0x66u, 0x80u}, {0x68u, 0x40u}, {0x69u, 0x40u}, {0x6Eu, 0x08u}, - {0x01u, 0x80u}, - {0x03u, 0x10u}, - {0x08u, 0x22u}, - {0x0Au, 0x10u}, - {0x0Bu, 0x02u}, - {0x10u, 0x10u}, - {0x12u, 0x08u}, - {0x15u, 0x04u}, - {0x16u, 0x20u}, - {0x18u, 0x04u}, - {0x19u, 0x84u}, - {0x1Bu, 0x02u}, - {0x20u, 0x08u}, - {0x21u, 0xA2u}, - {0x22u, 0x04u}, - {0x28u, 0x80u}, - {0x29u, 0x40u}, - {0x2Bu, 0x04u}, - {0x30u, 0x08u}, - {0x31u, 0x20u}, - {0x33u, 0x40u}, - {0x34u, 0x10u}, - {0x37u, 0x20u}, - {0x39u, 0x40u}, - {0x3Bu, 0x04u}, - {0x41u, 0x04u}, - {0x42u, 0x10u}, - {0x43u, 0x11u}, + {0x83u, 0x08u}, + {0x8Fu, 0x80u}, + {0x93u, 0x70u}, + {0x97u, 0x07u}, + {0xA5u, 0xAAu}, + {0xA7u, 0x55u}, + {0xA9u, 0x44u}, + {0xABu, 0x88u}, + {0xADu, 0x99u}, + {0xAFu, 0x22u}, + {0xB3u, 0x0Fu}, + {0xB7u, 0xF0u}, + {0xD9u, 0x04u}, + {0xDBu, 0x04u}, + {0xDCu, 0x10u}, + {0xDFu, 0x01u}, + {0x01u, 0x18u}, + {0x03u, 0x01u}, + {0x08u, 0x01u}, + {0x09u, 0x20u}, + {0x0Au, 0x08u}, + {0x10u, 0x28u}, + {0x18u, 0x20u}, + {0x19u, 0x08u}, + {0x1Au, 0x08u}, + {0x20u, 0x40u}, + {0x26u, 0x88u}, + {0x27u, 0x02u}, + {0x2Du, 0x04u}, + {0x2Eu, 0x80u}, + {0x2Fu, 0x28u}, + {0x33u, 0x04u}, + {0x35u, 0x04u}, + {0x36u, 0x08u}, + {0x37u, 0x02u}, + {0x3Du, 0x40u}, + {0x3Eu, 0x02u}, + {0x41u, 0x08u}, + {0x42u, 0x80u}, + {0x43u, 0x29u}, {0x4Au, 0x50u}, - {0x4Bu, 0x20u}, - {0x50u, 0x20u}, - {0x51u, 0x18u}, - {0x53u, 0x68u}, - {0x58u, 0x40u}, - {0x59u, 0x14u}, - {0x5Au, 0x01u}, - {0x60u, 0x04u}, - {0x61u, 0x82u}, - {0x63u, 0x10u}, - {0x68u, 0x42u}, - {0x69u, 0x14u}, - {0x70u, 0x50u}, - {0x72u, 0x80u}, - {0x73u, 0x20u}, - {0x83u, 0x40u}, - {0x84u, 0x40u}, - {0x86u, 0x04u}, - {0x87u, 0x1Au}, - {0x88u, 0x40u}, - {0x8Bu, 0x40u}, - {0x8Cu, 0xC0u}, - {0x8Du, 0x40u}, - {0x8Eu, 0x02u}, - {0xC0u, 0x05u}, - {0xC2u, 0x0Fu}, + {0x4Bu, 0x80u}, + {0x50u, 0x80u}, + {0x52u, 0x20u}, + {0x53u, 0x04u}, + {0x5Au, 0x25u}, + {0x5Bu, 0x40u}, + {0x5Du, 0x80u}, + {0x5Eu, 0x0Au}, + {0x5Fu, 0x20u}, + {0x60u, 0x08u}, + {0x61u, 0x40u}, + {0x63u, 0x50u}, + {0x64u, 0x02u}, + {0x69u, 0x61u}, + {0x6Bu, 0x10u}, + {0x70u, 0x28u}, + {0x72u, 0x42u}, + {0x80u, 0x02u}, + {0x81u, 0x02u}, + {0x84u, 0x08u}, + {0x86u, 0x20u}, + {0x8Bu, 0x24u}, + {0x8Eu, 0x10u}, + {0xC0u, 0x07u}, + {0xC2u, 0x0Au}, {0xC4u, 0x06u}, - {0xCAu, 0x0Du}, - {0xCCu, 0x0Eu}, - {0xCEu, 0x0Au}, + {0xCAu, 0x70u}, + {0xCCu, 0xC2u}, + {0xCEu, 0x90u}, {0xD0u, 0x07u}, - {0xD2u, 0x04u}, - {0xD6u, 0x0Fu}, - {0xD8u, 0x0Fu}, - {0xE2u, 0x06u}, - {0xE4u, 0x02u}, - {0xE6u, 0x81u}, - {0x02u, 0x0Eu}, - {0x04u, 0x0Bu}, - {0x06u, 0x10u}, - {0x07u, 0x7Fu}, - {0x09u, 0x8Cu}, - {0x0Bu, 0x30u}, - {0x11u, 0x71u}, - {0x13u, 0x80u}, - {0x14u, 0x08u}, - {0x15u, 0x03u}, - {0x19u, 0xECu}, - {0x1Au, 0x03u}, - {0x1Bu, 0x13u}, - {0x1Eu, 0x1Fu}, - {0x20u, 0x14u}, - {0x21u, 0x08u}, - {0x22u, 0x0Bu}, - {0x23u, 0x80u}, - {0x24u, 0x01u}, - {0x26u, 0x04u}, - {0x27u, 0x20u}, - {0x2Au, 0x04u}, + {0xD2u, 0x08u}, + {0xD6u, 0xFFu}, + {0xD8u, 0x1Fu}, + {0xE4u, 0x06u}, + {0xE6u, 0x09u}, + {0x04u, 0x24u}, + {0x05u, 0x01u}, + {0x06u, 0x08u}, + {0x09u, 0x07u}, + {0x0Bu, 0x18u}, + {0x0Cu, 0x01u}, + {0x0Du, 0x2Fu}, + {0x0Eu, 0x02u}, + {0x0Fu, 0x10u}, + {0x13u, 0x07u}, + {0x19u, 0x05u}, + {0x1Au, 0x20u}, + {0x1Eu, 0x1Du}, + {0x23u, 0x20u}, + {0x24u, 0x28u}, + {0x25u, 0x2Au}, + {0x26u, 0x14u}, + {0x27u, 0x15u}, + {0x2Au, 0x02u}, {0x2Bu, 0x02u}, - {0x2Du, 0x93u}, - {0x2Fu, 0x44u}, - {0x30u, 0x1Fu}, - {0x31u, 0x80u}, - {0x33u, 0x7Fu}, - {0x34u, 0x1Fu}, - {0x37u, 0x7Fu}, + {0x2Cu, 0x10u}, + {0x2Du, 0x28u}, + {0x2Eu, 0x20u}, + {0x2Fu, 0x16u}, + {0x31u, 0x20u}, + {0x32u, 0x03u}, + {0x35u, 0x1Fu}, + {0x36u, 0x3Cu}, + {0x3Bu, 0x20u}, + {0x3Eu, 0x04u}, {0x3Fu, 0x01u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, {0x5Cu, 0x11u}, {0x5Fu, 0x01u}, - {0x82u, 0x04u}, - {0x83u, 0x70u}, - {0x85u, 0x99u}, - {0x87u, 0x22u}, - {0x8Bu, 0x80u}, - {0x97u, 0x07u}, - {0x99u, 0xAAu}, - {0x9Au, 0x02u}, - {0x9Bu, 0x55u}, - {0xA5u, 0x44u}, - {0xA7u, 0x88u}, - {0xABu, 0x08u}, - {0xACu, 0x01u}, + {0x83u, 0x80u}, + {0x86u, 0x04u}, + {0x87u, 0x07u}, + {0x89u, 0xAAu}, + {0x8Au, 0x08u}, + {0x8Bu, 0x55u}, + {0x8Cu, 0x2Au}, + {0x8Eu, 0x54u}, + {0x8Fu, 0x70u}, + {0x95u, 0x99u}, + {0x96u, 0x02u}, + {0x97u, 0x22u}, + {0x9Au, 0x20u}, + {0x9Bu, 0x08u}, + {0x9Eu, 0x10u}, + {0xA6u, 0x01u}, + {0xAAu, 0x40u}, + {0xADu, 0x44u}, + {0xAFu, 0x88u}, + {0xB0u, 0x18u}, {0xB1u, 0xF0u}, - {0xB2u, 0x04u}, + {0xB2u, 0x01u}, {0xB3u, 0x0Fu}, - {0xB4u, 0x01u}, - {0xB6u, 0x02u}, - {0xBEu, 0x10u}, + {0xB4u, 0x60u}, + {0xB6u, 0x06u}, + {0xBEu, 0x51u}, {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, @@ -628,1418 +623,1591 @@ void cyfitter_cfg(void) {0xDCu, 0x19u}, {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x03u, 0x40u}, - {0x04u, 0x84u}, - {0x05u, 0x41u}, - {0x0Au, 0x04u}, - {0x0Cu, 0x80u}, - {0x0Du, 0x08u}, - {0x0Eu, 0x08u}, - {0x13u, 0x40u}, - {0x15u, 0x28u}, - {0x17u, 0x02u}, - {0x19u, 0x10u}, - {0x1Au, 0x10u}, + {0x00u, 0x20u}, + {0x01u, 0x40u}, + {0x02u, 0x11u}, + {0x06u, 0x01u}, + {0x07u, 0x20u}, + {0x09u, 0x24u}, + {0x0Bu, 0x02u}, + {0x0Du, 0x10u}, + {0x0Eu, 0x01u}, + {0x11u, 0x02u}, + {0x12u, 0x04u}, + {0x13u, 0x05u}, + {0x14u, 0x05u}, + {0x15u, 0x04u}, + {0x18u, 0x08u}, + {0x19u, 0x0Au}, {0x1Bu, 0x80u}, - {0x1Cu, 0x04u}, - {0x1Fu, 0x31u}, - {0x21u, 0x01u}, - {0x22u, 0x05u}, - {0x24u, 0x80u}, - {0x27u, 0x12u}, - {0x2Au, 0x20u}, - {0x2Bu, 0x20u}, - {0x2Cu, 0x20u}, - {0x2Du, 0x02u}, - {0x2Fu, 0x49u}, - {0x32u, 0x04u}, + {0x1Eu, 0x11u}, + {0x20u, 0x60u}, + {0x21u, 0x05u}, + {0x25u, 0x11u}, + {0x28u, 0x01u}, + {0x2Cu, 0x80u}, + {0x2Du, 0x04u}, + {0x2Eu, 0x80u}, + {0x2Fu, 0x04u}, + {0x30u, 0x08u}, {0x33u, 0x10u}, - {0x35u, 0x01u}, - {0x36u, 0x04u}, - {0x37u, 0x10u}, - {0x38u, 0x20u}, - {0x39u, 0x0Au}, - {0x3Cu, 0x28u}, - {0x42u, 0x08u}, - {0x43u, 0x10u}, - {0x58u, 0x04u}, - {0x59u, 0x80u}, - {0x5Bu, 0x20u}, - {0x5Cu, 0x08u}, - {0x5Eu, 0xA2u}, - {0x60u, 0x22u}, - {0x62u, 0x20u}, - {0x63u, 0x18u}, - {0x65u, 0x40u}, - {0x6Du, 0x04u}, - {0x6Eu, 0x08u}, - {0x6Fu, 0x06u}, - {0x81u, 0x20u}, - {0x82u, 0x10u}, - {0x87u, 0xB0u}, - {0x88u, 0x04u}, - {0x8Au, 0x04u}, - {0x8Eu, 0x04u}, - {0x8Fu, 0x14u}, + {0x36u, 0x23u}, + {0x38u, 0x40u}, + {0x39u, 0x19u}, + {0x3Du, 0xA0u}, + {0x3Fu, 0x08u}, + {0x58u, 0x20u}, + {0x5Au, 0x80u}, + {0x5Cu, 0x06u}, + {0x5Eu, 0xA0u}, + {0x61u, 0x10u}, + {0x62u, 0x40u}, + {0x63u, 0x04u}, + {0x67u, 0x01u}, + {0x80u, 0x04u}, + {0x81u, 0x98u}, + {0x84u, 0x20u}, + {0x86u, 0x20u}, + {0x8Au, 0x40u}, + {0x8Bu, 0x40u}, + {0x8Cu, 0x84u}, + {0x8Du, 0x10u}, + {0x8Fu, 0x40u}, {0x90u, 0x20u}, - {0x91u, 0x31u}, - {0x93u, 0x80u}, - {0x95u, 0x08u}, - {0x97u, 0x26u}, - {0x9Au, 0xA2u}, - {0x9Cu, 0x22u}, - {0x9Du, 0x10u}, - {0x9Fu, 0x11u}, - {0xA0u, 0xA6u}, - {0xA1u, 0x28u}, - {0xA2u, 0x51u}, - {0xA3u, 0x08u}, - {0xA6u, 0x08u}, - {0xA7u, 0x04u}, - {0xA9u, 0x80u}, - {0xACu, 0x08u}, + {0x91u, 0x35u}, + {0x92u, 0x40u}, + {0x93u, 0x08u}, + {0x96u, 0x04u}, + {0x97u, 0xC0u}, + {0x99u, 0x04u}, + {0x9Bu, 0x10u}, + {0x9Cu, 0x01u}, + {0x9Du, 0x82u}, + {0x9Eu, 0x80u}, + {0x9Fu, 0x04u}, + {0xA0u, 0x80u}, + {0xA1u, 0x20u}, + {0xA2u, 0xF0u}, + {0xA5u, 0x08u}, + {0xA6u, 0x05u}, {0xADu, 0x40u}, {0xAEu, 0x01u}, - {0xB0u, 0x80u}, - {0xB1u, 0x21u}, - {0xB6u, 0x01u}, - {0xB7u, 0x28u}, - {0xC0u, 0x38u}, - {0xC2u, 0xE2u}, - {0xC4u, 0x71u}, - {0xCAu, 0xF6u}, - {0xCCu, 0xE6u}, - {0xCEu, 0x67u}, - {0xD6u, 0xFEu}, - {0xD8u, 0x1Eu}, - {0xE2u, 0x42u}, - {0xE4u, 0x0Au}, - {0xE6u, 0x11u}, - {0xE8u, 0x04u}, - {0xEAu, 0x1Au}, - {0xEEu, 0x08u}, - {0x00u, 0x02u}, - {0x01u, 0x08u}, - {0x02u, 0x01u}, - {0x05u, 0x01u}, - {0x09u, 0x40u}, - {0x0Bu, 0x84u}, - {0x0Cu, 0x08u}, - {0x0Du, 0x91u}, - {0x0Eu, 0x10u}, - {0x0Fu, 0x22u}, - {0x10u, 0x02u}, - {0x12u, 0x01u}, - {0x14u, 0x02u}, - {0x15u, 0x08u}, - {0x16u, 0x01u}, + {0xB1u, 0x10u}, + {0xB3u, 0x30u}, + {0xB4u, 0xC0u}, + {0xB7u, 0x40u}, + {0xC0u, 0xA7u}, + {0xC2u, 0xC7u}, + {0xC4u, 0xE6u}, + {0xCAu, 0xF8u}, + {0xCCu, 0xA6u}, + {0xCEu, 0x7Fu}, + {0xD6u, 0xFCu}, + {0xD8u, 0x1Cu}, + {0xE2u, 0x0Cu}, + {0xE4u, 0x04u}, + {0xE6u, 0x2Au}, + {0xEAu, 0x08u}, + {0xEEu, 0x48u}, + {0x00u, 0x40u}, + {0x01u, 0x04u}, + {0x02u, 0x80u}, + {0x05u, 0x30u}, + {0x06u, 0x1Cu}, + {0x07u, 0x05u}, + {0x0Bu, 0x04u}, + {0x0Du, 0x04u}, + {0x0Eu, 0x43u}, + {0x11u, 0x04u}, + {0x12u, 0x20u}, + {0x14u, 0x03u}, + {0x15u, 0x07u}, + {0x16u, 0x40u}, + {0x17u, 0x18u}, {0x18u, 0x01u}, - {0x19u, 0x02u}, - {0x1Au, 0x0Au}, - {0x1Bu, 0x05u}, - {0x1Eu, 0x20u}, - {0x1Fu, 0x70u}, - {0x20u, 0x02u}, - {0x21u, 0x08u}, - {0x22u, 0x15u}, - {0x24u, 0x20u}, - {0x25u, 0xA0u}, - {0x26u, 0x40u}, - {0x27u, 0x55u}, - {0x29u, 0x08u}, - {0x2Au, 0x40u}, - {0x2Fu, 0x80u}, - {0x30u, 0x18u}, - {0x31u, 0x08u}, - {0x32u, 0x60u}, - {0x33u, 0x07u}, + {0x19u, 0x04u}, + {0x1Au, 0x02u}, + {0x1Cu, 0x90u}, + {0x1Eu, 0x63u}, + {0x1Fu, 0x08u}, + {0x20u, 0x01u}, + {0x22u, 0x02u}, + {0x23u, 0x02u}, + {0x24u, 0x2Bu}, + {0x26u, 0x54u}, + {0x28u, 0xA4u}, + {0x29u, 0x03u}, + {0x2Au, 0x4Bu}, + {0x2Bu, 0x28u}, + {0x2Du, 0x04u}, + {0x30u, 0xC0u}, + {0x31u, 0x07u}, + {0x32u, 0x3Cu}, {0x34u, 0x03u}, - {0x36u, 0x04u}, - {0x37u, 0xF0u}, - {0x39u, 0x02u}, - {0x3Au, 0x20u}, - {0x3Bu, 0x08u}, - {0x3Eu, 0x05u}, - {0x3Fu, 0x01u}, - {0x56u, 0x08u}, - {0x58u, 0x04u}, - {0x59u, 0x04u}, - {0x5Bu, 0x04u}, - {0x5Cu, 0x19u}, - {0x5Du, 0x90u}, - {0x5Fu, 0x01u}, - {0x84u, 0x40u}, - {0x86u, 0x1Fu}, - {0x88u, 0x03u}, - {0x8Au, 0x0Cu}, - {0x8Cu, 0x06u}, - {0x8Eu, 0x09u}, - {0x92u, 0x70u}, - {0x98u, 0x0Fu}, - {0xA0u, 0x05u}, - {0xA2u, 0x0Au}, - {0xA3u, 0x01u}, - {0xA4u, 0x10u}, - {0xA6u, 0x2Fu}, - {0xA8u, 0x20u}, - {0xAAu, 0x4Fu}, - {0xB0u, 0x7Fu}, - {0xB1u, 0x01u}, - {0xD8u, 0x04u}, - {0xD9u, 0x04u}, - {0xDCu, 0x91u}, - {0xDFu, 0x01u}, - {0x01u, 0x40u}, - {0x03u, 0x80u}, - {0x04u, 0xA4u}, - {0x09u, 0x01u}, - {0x0Au, 0x16u}, - {0x0Eu, 0x88u}, - {0x10u, 0x14u}, - {0x12u, 0x40u}, - {0x15u, 0x08u}, - {0x17u, 0x12u}, - {0x19u, 0x01u}, - {0x1Au, 0xA4u}, - {0x1Bu, 0x90u}, - {0x1Eu, 0x80u}, - {0x1Fu, 0x02u}, - {0x20u, 0x20u}, - {0x21u, 0x04u}, - {0x22u, 0x80u}, - {0x23u, 0x80u}, - {0x25u, 0x01u}, - {0x27u, 0x40u}, - {0x28u, 0x40u}, - {0x2Au, 0x88u}, - {0x2Bu, 0x08u}, - {0x2Fu, 0x80u}, - {0x30u, 0x08u}, - {0x31u, 0x20u}, - {0x32u, 0x80u}, - {0x39u, 0x04u}, - {0x3Bu, 0xA2u}, - {0x59u, 0x64u}, - {0x5Au, 0x01u}, - {0x62u, 0x48u}, - {0x63u, 0x44u}, - {0x69u, 0x40u}, - {0x81u, 0x04u}, - {0x83u, 0x80u}, - {0x84u, 0x14u}, - {0x86u, 0x80u}, - {0x89u, 0x44u}, - {0x8Bu, 0x40u}, - {0x90u, 0x04u}, - {0x91u, 0x15u}, - {0x92u, 0x12u}, - {0x93u, 0x30u}, - {0x95u, 0x08u}, - {0x96u, 0x20u}, - {0x97u, 0x44u}, - {0x98u, 0x42u}, - {0x99u, 0x20u}, - {0x9Au, 0x9Au}, - {0x9Bu, 0x10u}, - {0x9Du, 0x01u}, - {0x9Fu, 0x41u}, - {0xA0u, 0x02u}, - {0xA1u, 0x20u}, - {0xA2u, 0x24u}, - {0xA4u, 0x10u}, - {0xA6u, 0x08u}, - {0xA8u, 0x08u}, - {0xA9u, 0x02u}, - {0xACu, 0x40u}, - {0xAEu, 0x10u}, - {0xAFu, 0x02u}, - {0xB1u, 0x80u}, - {0xB2u, 0x04u}, - {0xC0u, 0xE9u}, - {0xC2u, 0x5Fu}, - {0xC4u, 0x7Eu}, - {0xCAu, 0x8Fu}, - {0xCCu, 0x0Eu}, - {0xCEu, 0x0Fu}, - {0xD6u, 0x0Fu}, - {0xD8u, 0x0Fu}, - {0xE2u, 0x18u}, - {0xE4u, 0x08u}, - {0xE6u, 0x23u}, - {0xEAu, 0x03u}, - {0xEEu, 0x08u}, - {0x03u, 0x02u}, - {0x05u, 0x01u}, - {0x06u, 0x0Cu}, - {0x09u, 0x10u}, - {0x0Bu, 0x28u}, - {0x0Du, 0x07u}, - {0x0Eu, 0x01u}, - {0x11u, 0x08u}, - {0x14u, 0x28u}, - {0x16u, 0x13u}, - {0x17u, 0x07u}, - {0x18u, 0x60u}, - {0x19u, 0x18u}, - {0x1Bu, 0x20u}, - {0x1Cu, 0x14u}, - {0x1Du, 0x08u}, - {0x1Eu, 0x43u}, - {0x1Fu, 0x30u}, - {0x22u, 0x82u}, - {0x23u, 0x08u}, - {0x25u, 0x10u}, - {0x27u, 0x28u}, - {0x28u, 0x11u}, - {0x29u, 0x04u}, - {0x2Au, 0x22u}, - {0x32u, 0x0Fu}, - {0x34u, 0x70u}, {0x35u, 0x07u}, - {0x36u, 0x80u}, {0x37u, 0x38u}, - {0x38u, 0x20u}, - {0x3Bu, 0x80u}, - {0x3Fu, 0x10u}, + {0x3Au, 0x22u}, + {0x3Bu, 0x33u}, + {0x54u, 0x01u}, {0x58u, 0x04u}, {0x59u, 0x04u}, - {0x5Cu, 0x10u}, + {0x5Bu, 0x04u}, + {0x5Cu, 0x01u}, + {0x5Du, 0x10u}, {0x5Fu, 0x01u}, - {0x80u, 0x33u}, - {0x82u, 0xCCu}, - {0x83u, 0xFFu}, - {0x84u, 0xFFu}, - {0x87u, 0xFFu}, - {0x8Au, 0xFFu}, - {0x8Bu, 0xFFu}, - {0x8Cu, 0x0Fu}, + {0x81u, 0x05u}, + {0x82u, 0x80u}, + {0x83u, 0x0Au}, + {0x84u, 0x01u}, + {0x86u, 0x12u}, + {0x89u, 0x03u}, + {0x8Bu, 0x0Cu}, + {0x8Cu, 0x04u}, {0x8Du, 0x0Fu}, - {0x8Eu, 0xF0u}, + {0x8Eu, 0x28u}, {0x8Fu, 0xF0u}, - {0x90u, 0xFFu}, - {0x96u, 0xFFu}, - {0x9Du, 0xFFu}, - {0xA1u, 0x55u}, - {0xA2u, 0xFFu}, - {0xA3u, 0xAAu}, - {0xA4u, 0x96u}, - {0xA5u, 0xFFu}, - {0xA6u, 0x69u}, - {0xA8u, 0x55u}, - {0xA9u, 0x33u}, - {0xAAu, 0xAAu}, - {0xABu, 0xCCu}, - {0xADu, 0x69u}, - {0xAFu, 0x96u}, - {0xB0u, 0xFFu}, - {0xB7u, 0xFFu}, - {0xBAu, 0x02u}, - {0xBBu, 0x80u}, - {0xD6u, 0x08u}, + {0x92u, 0x40u}, + {0x93u, 0xFFu}, + {0x9Bu, 0xFFu}, + {0x9Cu, 0x08u}, + {0x9Du, 0x09u}, + {0x9Eu, 0x04u}, + {0x9Fu, 0x06u}, + {0xA0u, 0x02u}, + {0xA2u, 0x01u}, + {0xA3u, 0xFFu}, + {0xA5u, 0x30u}, + {0xA7u, 0xC0u}, + {0xA9u, 0x50u}, + {0xABu, 0xA0u}, + {0xACu, 0x53u}, + {0xADu, 0x90u}, + {0xAEu, 0xACu}, + {0xAFu, 0x60u}, + {0xB0u, 0x0Fu}, + {0xB2u, 0x30u}, + {0xB4u, 0xC0u}, + {0xB5u, 0xFFu}, + {0xBEu, 0x15u}, + {0xBFu, 0x10u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x11u}, - {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x00u, 0x20u}, - {0x01u, 0x08u}, - {0x02u, 0x40u}, - {0x03u, 0x12u}, - {0x05u, 0x44u}, - {0x0Au, 0x80u}, - {0x0Bu, 0x20u}, - {0x0Cu, 0x08u}, - {0x0Eu, 0x08u}, - {0x0Fu, 0x22u}, - {0x11u, 0x01u}, - {0x12u, 0x20u}, - {0x13u, 0x10u}, - {0x16u, 0x88u}, - {0x17u, 0x20u}, - {0x18u, 0x80u}, - {0x1Bu, 0x02u}, - {0x1Du, 0x44u}, - {0x1Eu, 0x08u}, - {0x21u, 0x40u}, - {0x23u, 0x02u}, - {0x25u, 0x10u}, - {0x26u, 0x80u}, - {0x27u, 0x01u}, + {0x01u, 0x0Au}, + {0x02u, 0x02u}, + {0x05u, 0x04u}, + {0x06u, 0x81u}, + {0x08u, 0x08u}, + {0x09u, 0x40u}, + {0x0Au, 0x44u}, + {0x0Eu, 0x82u}, + {0x11u, 0x04u}, + {0x12u, 0x40u}, + {0x13u, 0x20u}, + {0x15u, 0x42u}, + {0x19u, 0x0Au}, + {0x1Au, 0x04u}, + {0x1Du, 0x19u}, + {0x20u, 0x44u}, + {0x21u, 0x02u}, + {0x22u, 0x50u}, + {0x26u, 0x10u}, {0x28u, 0x02u}, - {0x29u, 0x08u}, - {0x2Au, 0x12u}, - {0x2Cu, 0x08u}, - {0x2Du, 0x01u}, - {0x2Fu, 0x10u}, - {0x32u, 0x40u}, - {0x35u, 0x05u}, - {0x36u, 0x80u}, - {0x37u, 0x10u}, - {0x39u, 0x89u}, - {0x3Bu, 0x20u}, - {0x3Cu, 0x60u}, - {0x3Eu, 0x08u}, - {0x3Fu, 0x02u}, - {0x5Bu, 0x40u}, - {0x62u, 0x40u}, - {0x8Bu, 0x08u}, - {0x8Fu, 0x01u}, - {0x91u, 0x19u}, - {0x92u, 0x80u}, - {0x93u, 0x74u}, - {0x94u, 0xA0u}, - {0x97u, 0x02u}, - {0x98u, 0x02u}, - {0x99u, 0x01u}, - {0x9Au, 0x12u}, - {0x9Bu, 0x10u}, - {0x9Fu, 0x03u}, - {0xA0u, 0x12u}, - {0xA2u, 0x28u}, - {0xA7u, 0x08u}, - {0xA8u, 0x08u}, - {0xABu, 0x10u}, - {0xAEu, 0x01u}, - {0xB2u, 0x01u}, - {0xB3u, 0x02u}, - {0xB5u, 0x01u}, - {0xC0u, 0xAFu}, - {0xC2u, 0xECu}, - {0xC4u, 0x5Eu}, - {0xCAu, 0xEFu}, - {0xCCu, 0xF8u}, - {0xCEu, 0xFFu}, + {0x29u, 0x20u}, + {0x2Bu, 0x80u}, + {0x2Cu, 0x04u}, + {0x2Eu, 0x82u}, + {0x2Fu, 0x2Au}, + {0x30u, 0x20u}, + {0x32u, 0x44u}, + {0x33u, 0x01u}, + {0x35u, 0x01u}, + {0x36u, 0xE0u}, + {0x38u, 0x84u}, + {0x39u, 0x11u}, + {0x3Cu, 0x20u}, + {0x3Du, 0x40u}, + {0x3Eu, 0x01u}, + {0x3Fu, 0x11u}, + {0x5Bu, 0x40u}, + {0x65u, 0x02u}, + {0x67u, 0x80u}, + {0x6Du, 0x40u}, + {0x80u, 0x02u}, + {0x81u, 0x18u}, + {0x84u, 0x08u}, + {0x8Bu, 0x04u}, + {0x8Eu, 0x42u}, + {0x8Fu, 0x04u}, + {0x90u, 0x20u}, + {0x91u, 0x06u}, + {0x92u, 0x41u}, + {0x95u, 0x40u}, + {0x96u, 0x04u}, + {0x97u, 0x80u}, + {0x99u, 0x04u}, + {0x9Au, 0x60u}, + {0x9Bu, 0x60u}, + {0x9Cu, 0x04u}, + {0x9Eu, 0x14u}, + {0x9Fu, 0x04u}, + {0xA0u, 0x10u}, + {0xA1u, 0x60u}, + {0xA2u, 0x80u}, + {0xA6u, 0x06u}, + {0xA7u, 0x24u}, + {0xA8u, 0x02u}, + {0xAAu, 0x30u}, + {0xABu, 0x21u}, + {0xACu, 0x01u}, + {0xADu, 0x48u}, + {0xB3u, 0x80u}, + {0xB4u, 0x18u}, + {0xB5u, 0x04u}, + {0xB6u, 0xC0u}, + {0xB7u, 0x20u}, + {0xC0u, 0xBDu}, + {0xC2u, 0x9Fu}, + {0xC4u, 0x9Eu}, + {0xCAu, 0xFDu}, + {0xCCu, 0xBFu}, + {0xCEu, 0xBFu}, {0xD6u, 0x08u}, - {0xD8u, 0x08u}, - {0xE2u, 0x0Du}, - {0xEAu, 0x0Du}, - {0xECu, 0x01u}, - {0x00u, 0x0Fu}, - {0x01u, 0x03u}, - {0x02u, 0xF0u}, - {0x03u, 0x0Cu}, - {0x04u, 0x30u}, - {0x05u, 0xFFu}, - {0x06u, 0xC0u}, + {0xE2u, 0xD4u}, + {0xE4u, 0x04u}, + {0xE6u, 0x09u}, + {0xE8u, 0x01u}, + {0xEAu, 0x82u}, + {0x00u, 0xFFu}, + {0x07u, 0x02u}, {0x0Au, 0xFFu}, - {0x0Cu, 0x03u}, - {0x0Du, 0x05u}, - {0x0Eu, 0x0Cu}, - {0x0Fu, 0x0Au}, - {0x10u, 0x05u}, - {0x12u, 0x0Au}, - {0x14u, 0x09u}, - {0x15u, 0x50u}, - {0x16u, 0x06u}, - {0x17u, 0xA0u}, - {0x19u, 0x30u}, - {0x1Au, 0xFFu}, - {0x1Bu, 0xC0u}, - {0x1Du, 0x0Fu}, - {0x1Eu, 0xFFu}, - {0x1Fu, 0xF0u}, - {0x20u, 0x90u}, - {0x21u, 0x90u}, - {0x22u, 0x60u}, - {0x23u, 0x60u}, + {0x0Bu, 0x01u}, + {0x0Du, 0x04u}, + {0x0Eu, 0xFFu}, + {0x10u, 0x60u}, + {0x11u, 0x04u}, + {0x12u, 0x90u}, + {0x14u, 0x03u}, + {0x16u, 0x0Cu}, + {0x19u, 0x04u}, + {0x1Cu, 0x05u}, + {0x1Eu, 0x0Au}, + {0x20u, 0x06u}, + {0x22u, 0x09u}, {0x24u, 0x50u}, + {0x25u, 0x04u}, {0x26u, 0xA0u}, - {0x27u, 0xFFu}, - {0x29u, 0x09u}, - {0x2Bu, 0x06u}, - {0x2Du, 0xFFu}, - {0x36u, 0xFFu}, - {0x37u, 0xFFu}, - {0x3Eu, 0x40u}, + {0x28u, 0x30u}, + {0x2Au, 0xC0u}, + {0x2Cu, 0x0Fu}, + {0x2Eu, 0xF0u}, + {0x33u, 0x01u}, + {0x34u, 0xFFu}, + {0x35u, 0x02u}, + {0x37u, 0x04u}, + {0x39u, 0x80u}, + {0x3Eu, 0x10u}, {0x3Fu, 0x40u}, {0x58u, 0x04u}, {0x59u, 0x04u}, + {0x5Cu, 0x90u}, {0x5Fu, 0x01u}, - {0x80u, 0x06u}, - {0x82u, 0x18u}, - {0x84u, 0x02u}, - {0x85u, 0x02u}, - {0x86u, 0x04u}, - {0x8Cu, 0x40u}, - {0x8Eu, 0x20u}, - {0x90u, 0x40u}, + {0x80u, 0x04u}, + {0x81u, 0x0Cu}, + {0x84u, 0x09u}, + {0x85u, 0x40u}, + {0x86u, 0x06u}, + {0x87u, 0x30u}, + {0x8Au, 0x06u}, + {0x8Bu, 0x0Cu}, + {0x8Cu, 0x06u}, + {0x8Du, 0x50u}, + {0x8Fu, 0x2Fu}, + {0x90u, 0x02u}, + {0x91u, 0x0Cu}, + {0x94u, 0x01u}, + {0x95u, 0x11u}, + {0x96u, 0x0Eu}, + {0x97u, 0x62u}, + {0x99u, 0x04u}, + {0x9Bu, 0x08u}, + {0x9Cu, 0x06u}, + {0x9Du, 0x0Cu}, + {0xA0u, 0x06u}, + {0xA1u, 0x08u}, + {0xA4u, 0x02u}, + {0xA6u, 0x04u}, + {0xA8u, 0x07u}, + {0xA9u, 0x31u}, + {0xAAu, 0x08u}, + {0xABu, 0x4Eu}, + {0xADu, 0x04u}, + {0xB3u, 0x0Fu}, + {0xB4u, 0x0Fu}, + {0xB5u, 0x70u}, + {0xB8u, 0x20u}, + {0xBBu, 0x20u}, + {0xD6u, 0x02u}, + {0xD7u, 0x24u}, + {0xD8u, 0x04u}, + {0xD9u, 0x04u}, + {0xDBu, 0x04u}, + {0xDFu, 0x01u}, + {0x00u, 0x04u}, + {0x01u, 0x10u}, + {0x03u, 0x81u}, + {0x05u, 0x11u}, + {0x06u, 0x02u}, + {0x08u, 0x02u}, + {0x0Au, 0x21u}, + {0x0Eu, 0x40u}, + {0x0Fu, 0x11u}, + {0x10u, 0xA0u}, + {0x12u, 0x08u}, + {0x14u, 0x18u}, + {0x15u, 0x40u}, + {0x16u, 0x40u}, + {0x18u, 0x04u}, + {0x19u, 0x20u}, + {0x1Au, 0x04u}, + {0x1Fu, 0x10u}, + {0x22u, 0x0Cu}, + {0x23u, 0x04u}, + {0x24u, 0x02u}, + {0x25u, 0x14u}, + {0x27u, 0x04u}, + {0x28u, 0x02u}, + {0x29u, 0x20u}, + {0x2Bu, 0x80u}, + {0x2Eu, 0x40u}, + {0x2Fu, 0x12u}, + {0x30u, 0xA0u}, + {0x32u, 0x04u}, + {0x33u, 0x01u}, + {0x36u, 0x12u}, + {0x38u, 0x40u}, + {0x39u, 0x11u}, + {0x3Bu, 0x04u}, + {0x3Cu, 0x80u}, + {0x3Du, 0x08u}, + {0x3Eu, 0x20u}, + {0x62u, 0xC0u}, + {0x63u, 0x04u}, + {0x68u, 0x21u}, + {0x69u, 0x11u}, + {0x6Au, 0x01u}, + {0x6Bu, 0x01u}, + {0x70u, 0xC0u}, + {0x78u, 0x10u}, + {0x7Bu, 0x08u}, + {0x80u, 0x01u}, + {0x86u, 0x01u}, + {0x88u, 0x20u}, + {0x89u, 0x10u}, + {0x8Cu, 0x80u}, + {0x90u, 0x60u}, + {0x91u, 0x40u}, {0x92u, 0x20u}, - {0x93u, 0x01u}, + {0x93u, 0x11u}, + {0x94u, 0x80u}, + {0x95u, 0x11u}, + {0x96u, 0x08u}, + {0x97u, 0x08u}, + {0x98u, 0x02u}, + {0x99u, 0x09u}, + {0x9Au, 0x22u}, + {0x9Du, 0x20u}, + {0x9Eu, 0x15u}, + {0x9Fu, 0x05u}, + {0xA1u, 0x22u}, + {0xA2u, 0x90u}, + {0xA3u, 0x04u}, + {0xA4u, 0x20u}, + {0xA6u, 0x25u}, + {0xA7u, 0xAAu}, + {0xADu, 0x01u}, + {0xB2u, 0x02u}, + {0xB4u, 0x04u}, + {0xC0u, 0xDFu}, + {0xC2u, 0xBDu}, + {0xC4u, 0xFEu}, + {0xCAu, 0x4Du}, + {0xCCu, 0xAFu}, + {0xCEu, 0x7Fu}, + {0xD8u, 0x04u}, + {0xE0u, 0x08u}, + {0xE2u, 0x01u}, + {0xEAu, 0x32u}, + {0xECu, 0x02u}, + {0x81u, 0x40u}, + {0x82u, 0x40u}, + {0x84u, 0x04u}, + {0x85u, 0x01u}, + {0x88u, 0x08u}, + {0x8Au, 0x16u}, + {0x8Eu, 0x01u}, + {0x8Fu, 0x40u}, + {0x90u, 0x20u}, + {0x91u, 0x06u}, {0x94u, 0x04u}, - {0x96u, 0x02u}, - {0x98u, 0x20u}, - {0x9Au, 0x40u}, + {0x95u, 0x01u}, + {0x96u, 0x08u}, + {0x9Bu, 0x02u}, {0x9Cu, 0x40u}, + {0x9Du, 0x08u}, {0x9Eu, 0x20u}, - {0xA0u, 0x10u}, - {0xA2u, 0x08u}, - {0xA8u, 0x40u}, - {0xA9u, 0x08u}, - {0xAAu, 0x21u}, - {0xACu, 0x08u}, - {0xAEu, 0x10u}, - {0xAFu, 0x04u}, - {0xB0u, 0x1Eu}, - {0xB1u, 0x04u}, - {0xB3u, 0x01u}, - {0xB4u, 0x60u}, - {0xB5u, 0x02u}, - {0xB6u, 0x01u}, - {0xB7u, 0x08u}, + {0xA0u, 0x02u}, + {0xA2u, 0x80u}, + {0xA4u, 0x08u}, + {0xA5u, 0x08u}, + {0xA6u, 0x10u}, + {0xA7u, 0x42u}, + {0xABu, 0x04u}, + {0xADu, 0x04u}, + {0xB0u, 0x40u}, + {0xB4u, 0x16u}, + {0xB5u, 0x40u}, + {0xE0u, 0x80u}, + {0xE2u, 0x04u}, + {0xE4u, 0x60u}, + {0xEAu, 0x33u}, + {0xECu, 0x40u}, + {0xEEu, 0x20u}, + {0x00u, 0x08u}, + {0x02u, 0x10u}, + {0x08u, 0x01u}, + {0x0Au, 0x0Au}, + {0x0Cu, 0x02u}, + {0x0Du, 0x01u}, + {0x0Eu, 0x01u}, + {0x0Fu, 0x02u}, + {0x14u, 0x02u}, + {0x15u, 0x02u}, + {0x16u, 0x01u}, + {0x17u, 0x01u}, + {0x18u, 0x02u}, + {0x1Au, 0x01u}, + {0x1Du, 0x02u}, + {0x1Fu, 0x01u}, + {0x20u, 0x02u}, + {0x21u, 0x02u}, + {0x22u, 0x11u}, + {0x23u, 0x01u}, + {0x29u, 0x02u}, + {0x2Au, 0x04u}, + {0x2Bu, 0x01u}, + {0x30u, 0x04u}, + {0x31u, 0x03u}, + {0x34u, 0x03u}, + {0x36u, 0x18u}, + {0x3Au, 0x20u}, + {0x3Bu, 0x02u}, + {0x3Eu, 0x40u}, + {0x56u, 0x08u}, + {0x58u, 0x04u}, + {0x59u, 0x04u}, + {0x5Bu, 0x04u}, + {0x5Cu, 0x99u}, + {0x5Du, 0x90u}, + {0x5Fu, 0x01u}, + {0x80u, 0x10u}, + {0x81u, 0x35u}, + {0x82u, 0x0Cu}, + {0x85u, 0x08u}, + {0x87u, 0x34u}, + {0x89u, 0x0Au}, + {0x8Bu, 0x11u}, + {0x8Cu, 0x10u}, + {0x8Du, 0x35u}, + {0x8Eu, 0x08u}, + {0x91u, 0x02u}, + {0x93u, 0x01u}, + {0x94u, 0x10u}, + {0x95u, 0x05u}, + {0x96u, 0x0Au}, + {0x97u, 0x0Au}, + {0x98u, 0x08u}, + {0x99u, 0x35u}, + {0x9Au, 0x10u}, + {0x9Du, 0x34u}, + {0x9Fu, 0x01u}, + {0xA9u, 0x35u}, + {0xACu, 0x10u}, + {0xADu, 0x0Bu}, + {0xAEu, 0x09u}, + {0xAFu, 0x20u}, + {0xB0u, 0x04u}, + {0xB2u, 0x01u}, + {0xB3u, 0x3Cu}, + {0xB4u, 0x18u}, + {0xB6u, 0x02u}, + {0xB7u, 0x03u}, {0xBAu, 0x20u}, - {0xBEu, 0x01u}, + {0xBBu, 0x88u}, {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x99u}, + {0xDCu, 0x09u}, {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x01u, 0x80u}, - {0x02u, 0x40u}, - {0x03u, 0x20u}, - {0x04u, 0x22u}, - {0x06u, 0x4Au}, - {0x07u, 0x90u}, - {0x08u, 0x06u}, - {0x0Au, 0x0Au}, - {0x0Cu, 0x18u}, - {0x0Du, 0x02u}, - {0x0Eu, 0x01u}, - {0x0Fu, 0x6Au}, - {0x10u, 0x80u}, - {0x12u, 0x09u}, - {0x14u, 0x40u}, - {0x17u, 0x05u}, - {0x19u, 0xA0u}, - {0x1Au, 0x08u}, - {0x1Bu, 0x03u}, - {0x1Fu, 0x80u}, - {0x21u, 0x40u}, - {0x22u, 0x09u}, - {0x23u, 0x04u}, - {0x26u, 0x40u}, - {0x28u, 0x02u}, - {0x29u, 0x20u}, - {0x2Cu, 0x58u}, - {0x2Fu, 0x02u}, - {0x32u, 0x01u}, - {0x37u, 0x94u}, - {0x39u, 0x08u}, - {0x3Eu, 0x0Au}, - {0x3Fu, 0x40u}, - {0x58u, 0x80u}, + {0x00u, 0x02u}, + {0x01u, 0x20u}, + {0x03u, 0x02u}, + {0x04u, 0x41u}, + {0x08u, 0x20u}, + {0x09u, 0x08u}, + {0x0Cu, 0x20u}, + {0x0Eu, 0x14u}, + {0x10u, 0x04u}, + {0x12u, 0x40u}, + {0x14u, 0x01u}, + {0x18u, 0x02u}, + {0x19u, 0xA1u}, + {0x1Bu, 0x80u}, + {0x1Cu, 0x41u}, + {0x1Eu, 0x14u}, + {0x20u, 0x80u}, + {0x21u, 0x01u}, + {0x23u, 0x40u}, + {0x25u, 0x04u}, + {0x27u, 0x02u}, + {0x29u, 0x01u}, + {0x2Bu, 0x04u}, + {0x2Cu, 0x0Au}, + {0x30u, 0x04u}, + {0x32u, 0x84u}, + {0x34u, 0x40u}, + {0x35u, 0x08u}, + {0x36u, 0x10u}, + {0x37u, 0x02u}, + {0x3Bu, 0x40u}, + {0x3Du, 0x09u}, + {0x3Eu, 0x20u}, + {0x3Fu, 0x80u}, + {0x58u, 0x10u}, + {0x5Au, 0x40u}, + {0x5Bu, 0x04u}, + {0x5Du, 0x40u}, {0x60u, 0x02u}, - {0x81u, 0x40u}, - {0x8Au, 0x40u}, - {0x8Fu, 0x80u}, - {0x90u, 0x22u}, - {0x91u, 0x08u}, - {0x96u, 0x09u}, - {0x98u, 0x04u}, - {0x9Au, 0x03u}, - {0x9Bu, 0x15u}, - {0xA0u, 0x80u}, - {0xA3u, 0x24u}, - {0xA5u, 0x02u}, - {0xA7u, 0x12u}, - {0xA8u, 0x02u}, - {0xA9u, 0x08u}, - {0xB0u, 0x80u}, - {0xB1u, 0x80u}, - {0xB7u, 0x40u}, - {0xC0u, 0xFDu}, - {0xC2u, 0xFFu}, - {0xC4u, 0x3Bu}, - {0xCAu, 0xFCu}, - {0xCCu, 0x71u}, - {0xCEu, 0xD2u}, - {0xD6u, 0x08u}, - {0xD8u, 0x08u}, - {0xE2u, 0x6Cu}, - {0xE8u, 0x20u}, - {0xEAu, 0x0Cu}, - {0xECu, 0xC0u}, - {0x00u, 0x01u}, - {0x01u, 0x0Fu}, - {0x02u, 0x02u}, - {0x03u, 0xF0u}, - {0x06u, 0x01u}, - {0x09u, 0xFFu}, - {0x0Du, 0x60u}, - {0x0Eu, 0x02u}, - {0x0Fu, 0x90u}, - {0x11u, 0x05u}, - {0x13u, 0x0Au}, - {0x15u, 0x50u}, - {0x17u, 0xA0u}, - {0x19u, 0x30u}, - {0x1Bu, 0xC0u}, - {0x21u, 0x03u}, - {0x23u, 0x0Cu}, - {0x25u, 0x06u}, - {0x27u, 0x09u}, - {0x2Bu, 0xFFu}, - {0x2Fu, 0xFFu}, - {0x33u, 0xFFu}, + {0x62u, 0x18u}, + {0x64u, 0x01u}, + {0x68u, 0x01u}, + {0x6Cu, 0x04u}, + {0x6Eu, 0x08u}, + {0x6Fu, 0x01u}, + {0x83u, 0x02u}, + {0x87u, 0x80u}, + {0x88u, 0x10u}, + {0x8Eu, 0x04u}, + {0x92u, 0x40u}, + {0x94u, 0x06u}, + {0x95u, 0x02u}, + {0x97u, 0x40u}, + {0x98u, 0x20u}, + {0x9Au, 0x40u}, + {0x9Cu, 0x02u}, + {0x9Du, 0xA0u}, + {0x9Eu, 0x10u}, + {0x9Fu, 0x01u}, + {0xA2u, 0x80u}, + {0xA3u, 0x04u}, + {0xA4u, 0x60u}, + {0xA6u, 0x0Cu}, + {0xAAu, 0x10u}, + {0xAFu, 0x20u}, + {0xB0u, 0x04u}, + {0xB5u, 0x40u}, + {0xB6u, 0x50u}, + {0xC0u, 0x9Bu}, + {0xC2u, 0x66u}, + {0xC4u, 0x8Au}, + {0xCAu, 0x35u}, + {0xCCu, 0xFAu}, + {0xCEu, 0xF8u}, + {0xD6u, 0x1Eu}, + {0xD8u, 0x1Eu}, + {0xE2u, 0x44u}, + {0xE4u, 0x04u}, + {0xE8u, 0x01u}, + {0xEAu, 0x10u}, + {0xEEu, 0x14u}, + {0x00u, 0xD3u}, + {0x01u, 0x53u}, + {0x02u, 0x20u}, + {0x03u, 0x24u}, + {0x05u, 0x20u}, + {0x08u, 0x01u}, + {0x09u, 0x01u}, + {0x0Au, 0x02u}, + {0x0Bu, 0x02u}, + {0x0Cu, 0xC3u}, + {0x0Eu, 0x20u}, + {0x0Fu, 0x7Fu}, + {0x11u, 0x01u}, + {0x13u, 0x02u}, + {0x14u, 0x04u}, + {0x16u, 0xE3u}, + {0x17u, 0x04u}, + {0x19u, 0x24u}, + {0x1Au, 0x04u}, + {0x1Bu, 0x4Bu}, + {0x1Cu, 0x40u}, + {0x1Eu, 0x80u}, + {0x20u, 0x08u}, + {0x22u, 0xC3u}, + {0x23u, 0x10u}, + {0x24u, 0x40u}, + {0x26u, 0x80u}, + {0x28u, 0x01u}, + {0x29u, 0x04u}, + {0x2Au, 0x02u}, + {0x2Bu, 0x1Bu}, + {0x2Cu, 0x14u}, + {0x2Du, 0x0Bu}, + {0x2Eu, 0xE3u}, + {0x32u, 0x3Cu}, + {0x33u, 0x7Cu}, {0x34u, 0x03u}, - {0x3Eu, 0x10u}, - {0x3Fu, 0x04u}, + {0x36u, 0xC0u}, + {0x37u, 0x03u}, + {0x38u, 0x08u}, + {0x3Au, 0xA0u}, + {0x3Bu, 0x80u}, {0x58u, 0x04u}, {0x59u, 0x04u}, - {0x5Bu, 0x04u}, + {0x5Cu, 0x11u}, {0x5Fu, 0x01u}, - {0x80u, 0x10u}, - {0x81u, 0x0Fu}, - {0x82u, 0x20u}, - {0x83u, 0xF0u}, - {0x85u, 0x50u}, - {0x87u, 0xA0u}, - {0x88u, 0x0Au}, - {0x8Au, 0x05u}, - {0x91u, 0x05u}, - {0x92u, 0x20u}, - {0x93u, 0x0Au}, - {0x96u, 0x10u}, - {0x99u, 0x03u}, - {0x9Au, 0x07u}, - {0x9Bu, 0x0Cu}, - {0x9Du, 0x06u}, - {0x9Eu, 0x08u}, - {0x9Fu, 0x09u}, - {0xA0u, 0x09u}, - {0xA2u, 0x02u}, - {0xA4u, 0x04u}, - {0xA5u, 0x60u}, - {0xA6u, 0x08u}, - {0xA7u, 0x90u}, - {0xADu, 0x30u}, - {0xAFu, 0xC0u}, - {0xB2u, 0x30u}, - {0xB3u, 0xFFu}, - {0xB4u, 0x0Fu}, - {0xBEu, 0x04u}, - {0xBFu, 0x04u}, - {0xD4u, 0x01u}, + {0x83u, 0xFFu}, + {0x85u, 0x69u}, + {0x87u, 0x96u}, + {0x88u, 0x55u}, + {0x8Au, 0xAAu}, + {0x8Cu, 0xFFu}, + {0x90u, 0x33u}, + {0x91u, 0x0Fu}, + {0x92u, 0xCCu}, + {0x93u, 0xF0u}, + {0x96u, 0xFFu}, + {0x97u, 0xFFu}, + {0x98u, 0x0Fu}, + {0x99u, 0x55u}, + {0x9Au, 0xF0u}, + {0x9Bu, 0xAAu}, + {0xA0u, 0xFFu}, + {0xA1u, 0xFFu}, + {0xA4u, 0x96u}, + {0xA5u, 0x33u}, + {0xA6u, 0x69u}, + {0xA7u, 0xCCu}, + {0xAAu, 0xFFu}, + {0xABu, 0xFFu}, + {0xADu, 0xFFu}, + {0xAEu, 0xFFu}, + {0xB1u, 0xFFu}, + {0xB4u, 0xFFu}, + {0xBAu, 0x20u}, + {0xBBu, 0x02u}, + {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x01u}, - {0xDDu, 0x10u}, + {0xDCu, 0x11u}, + {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x00u, 0x81u}, - {0x03u, 0x20u}, - {0x04u, 0x02u}, - {0x07u, 0x08u}, - {0x0Cu, 0x02u}, - {0x0Du, 0x40u}, - {0x0Eu, 0x28u}, - {0x15u, 0x04u}, - {0x16u, 0x40u}, + {0x01u, 0x90u}, + {0x02u, 0x08u}, + {0x05u, 0x91u}, + {0x08u, 0x02u}, + {0x0Au, 0x14u}, + {0x0Du, 0x08u}, + {0x0Eu, 0x0Au}, + {0x10u, 0x40u}, + {0x13u, 0x64u}, + {0x15u, 0x82u}, + {0x16u, 0x14u}, + {0x17u, 0x10u}, {0x1Au, 0x04u}, - {0x1Cu, 0x10u}, - {0x1Eu, 0x08u}, - {0x1Fu, 0x20u}, - {0x21u, 0x08u}, + {0x1Du, 0x10u}, + {0x1Eu, 0x12u}, + {0x1Fu, 0xA8u}, + {0x22u, 0x02u}, {0x24u, 0x20u}, + {0x25u, 0x0Cu}, + {0x27u, 0x22u}, + {0x28u, 0x40u}, + {0x29u, 0x81u}, {0x2Au, 0x02u}, - {0x2Bu, 0x16u}, - {0x2Cu, 0x22u}, - {0x31u, 0x02u}, - {0x33u, 0x14u}, - {0x34u, 0x80u}, - {0x36u, 0x11u}, - {0x38u, 0x23u}, - {0x39u, 0x42u}, - {0x3Cu, 0x09u}, - {0x58u, 0x01u}, - {0x59u, 0x50u}, - {0x5Au, 0x08u}, - {0x5Du, 0x80u}, - {0x60u, 0x02u}, - {0x6Cu, 0x80u}, - {0x6Du, 0x40u}, - {0x6Fu, 0x15u}, - {0x74u, 0x76u}, - {0x76u, 0x01u}, - {0x84u, 0x10u}, - {0x85u, 0x01u}, - {0x86u, 0x10u}, - {0x89u, 0x01u}, - {0x8Au, 0x40u}, - {0x8Cu, 0x10u}, - {0x90u, 0x02u}, - {0x91u, 0x8Cu}, - {0x94u, 0x20u}, - {0x95u, 0x01u}, - {0x96u, 0x05u}, - {0x98u, 0x05u}, - {0x99u, 0x50u}, - {0x9Au, 0x02u}, - {0x9Bu, 0x08u}, - {0x9Eu, 0x40u}, - {0x9Fu, 0x15u}, - {0xA2u, 0x01u}, - {0xA3u, 0x04u}, - {0xA4u, 0x84u}, - {0xA5u, 0x02u}, - {0xA7u, 0x50u}, - {0xA9u, 0x10u}, - {0xACu, 0x80u}, - {0xAEu, 0x80u}, - {0xAFu, 0x04u}, - {0xB1u, 0x08u}, - {0xC0u, 0x5Du}, - {0xC2u, 0xF0u}, - {0xC4u, 0x30u}, - {0xCAu, 0x5Fu}, - {0xCCu, 0xB7u}, - {0xCEu, 0xCDu}, - {0xD6u, 0x1Fu}, - {0xD8u, 0x08u}, - {0xE2u, 0x90u}, + {0x2Bu, 0x18u}, + {0x2Du, 0x82u}, + {0x2Fu, 0x08u}, + {0x31u, 0x08u}, + {0x32u, 0x02u}, + {0x33u, 0x10u}, + {0x36u, 0x04u}, + {0x37u, 0x22u}, + {0x39u, 0x0Au}, + {0x3Cu, 0x80u}, + {0x3Du, 0x10u}, + {0x3Eu, 0x0Au}, + {0x58u, 0x04u}, + {0x5Au, 0x20u}, + {0x5Bu, 0x40u}, + {0x62u, 0x44u}, + {0x63u, 0x04u}, + {0x80u, 0x04u}, + {0x82u, 0x80u}, + {0x83u, 0x40u}, + {0x86u, 0x40u}, + {0x89u, 0x04u}, + {0x8Bu, 0x03u}, + {0x8Du, 0x01u}, + {0x8Fu, 0x04u}, + {0x94u, 0x22u}, + {0x95u, 0x02u}, + {0x96u, 0x14u}, + {0x98u, 0x20u}, + {0x99u, 0x02u}, + {0x9Au, 0x0Au}, + {0x9Cu, 0x02u}, + {0x9Du, 0xA0u}, + {0x9Eu, 0x10u}, + {0xA1u, 0x01u}, + {0xA3u, 0x10u}, + {0xA4u, 0x20u}, + {0xA5u, 0x04u}, + {0xA6u, 0x06u}, + {0xA7u, 0xA0u}, + {0xAAu, 0x40u}, + {0xABu, 0x04u}, + {0xACu, 0x40u}, + {0xADu, 0x20u}, + {0xAEu, 0x04u}, + {0xB2u, 0x02u}, + {0xB3u, 0x0Cu}, + {0xB4u, 0x20u}, + {0xB6u, 0x20u}, + {0xB7u, 0x02u}, + {0xC0u, 0xD3u}, + {0xC2u, 0xEEu}, + {0xC4u, 0xFFu}, + {0xCAu, 0xBFu}, + {0xCCu, 0xE7u}, + {0xCEu, 0xF3u}, + {0xD6u, 0x0Eu}, + {0xD8u, 0x0Eu}, + {0xE0u, 0x40u}, + {0xE2u, 0x30u}, {0xE4u, 0x80u}, - {0xE6u, 0x21u}, - {0xEEu, 0xA2u}, - {0x00u, 0x0Fu}, - {0x02u, 0xF0u}, - {0x04u, 0x30u}, - {0x05u, 0x0Fu}, - {0x06u, 0xC0u}, - {0x07u, 0x10u}, - {0x09u, 0x07u}, - {0x0Au, 0xFFu}, - {0x0Bu, 0x18u}, - {0x0Fu, 0x07u}, - {0x10u, 0x05u}, - {0x12u, 0x0Au}, - {0x14u, 0x06u}, - {0x15u, 0x0Cu}, - {0x16u, 0x09u}, - {0x17u, 0x13u}, - {0x1Au, 0xFFu}, - {0x1Bu, 0x04u}, - {0x1Cu, 0xFFu}, - {0x20u, 0x60u}, - {0x21u, 0x08u}, - {0x22u, 0x90u}, - {0x23u, 0x16u}, - {0x24u, 0x50u}, - {0x25u, 0x01u}, - {0x26u, 0xA0u}, - {0x27u, 0x02u}, - {0x29u, 0x01u}, - {0x2Cu, 0x03u}, - {0x2Eu, 0x0Cu}, - {0x2Fu, 0x07u}, + {0xE6u, 0x2Bu}, + {0xE8u, 0x40u}, + {0xEAu, 0x95u}, + {0xECu, 0x40u}, + {0xEEu, 0x80u}, + {0x01u, 0x3Fu}, + {0x04u, 0x69u}, + {0x05u, 0x3Fu}, + {0x06u, 0x96u}, + {0x08u, 0x0Fu}, + {0x09u, 0x01u}, + {0x0Au, 0xF0u}, + {0x0Bu, 0x02u}, + {0x0Cu, 0xFFu}, + {0x0Fu, 0x3Fu}, + {0x14u, 0x55u}, + {0x16u, 0xAAu}, + {0x17u, 0x3Fu}, + {0x18u, 0xFFu}, + {0x1Bu, 0x3Fu}, + {0x1Cu, 0x33u}, + {0x1Du, 0x10u}, + {0x1Eu, 0xCCu}, + {0x1Fu, 0x20u}, + {0x21u, 0x04u}, + {0x22u, 0xFFu}, + {0x23u, 0x08u}, + {0x25u, 0x10u}, + {0x26u, 0xFFu}, + {0x27u, 0x20u}, + {0x29u, 0x04u}, + {0x2Au, 0xFFu}, + {0x2Bu, 0x08u}, + {0x2Du, 0x01u}, + {0x2Fu, 0x02u}, {0x32u, 0xFFu}, - {0x35u, 0x1Fu}, - {0x3Bu, 0x20u}, - {0x3Eu, 0x04u}, + {0x33u, 0x0Cu}, + {0x35u, 0x03u}, + {0x37u, 0x30u}, + {0x3Au, 0x08u}, + {0x3Bu, 0xA8u}, {0x56u, 0x08u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x10u}, + {0x5Cu, 0x11u}, {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x80u, 0x02u}, - {0x81u, 0x02u}, - {0x82u, 0x01u}, - {0x83u, 0x04u}, - {0x84u, 0x01u}, - {0x86u, 0x02u}, - {0x8Au, 0x08u}, - {0x8Cu, 0x02u}, - {0x8Eu, 0x01u}, - {0x92u, 0x04u}, - {0x93u, 0x04u}, - {0x94u, 0x02u}, - {0x96u, 0x01u}, - {0x97u, 0x08u}, - {0x98u, 0x02u}, - {0x9Au, 0x01u}, - {0x9Fu, 0x01u}, - {0xA7u, 0x02u}, - {0xACu, 0x04u}, - {0xAEu, 0x08u}, - {0xB1u, 0x08u}, - {0xB2u, 0x0Cu}, - {0xB3u, 0x01u}, - {0xB4u, 0x03u}, - {0xB5u, 0x06u}, + {0x80u, 0xE0u}, + {0x83u, 0x70u}, + {0x84u, 0x14u}, + {0x85u, 0x40u}, + {0x87u, 0x1Fu}, + {0x88u, 0x09u}, + {0x89u, 0x10u}, + {0x8Au, 0xF2u}, + {0x8Bu, 0x2Fu}, + {0x91u, 0x03u}, + {0x92u, 0x09u}, + {0x93u, 0x0Cu}, + {0x94u, 0x06u}, + {0x95u, 0x0Fu}, + {0x96u, 0xF8u}, + {0x98u, 0x40u}, + {0x99u, 0x20u}, + {0x9Au, 0x80u}, + {0x9Bu, 0x4Fu}, + {0x9Cu, 0x40u}, + {0x9Eu, 0x80u}, + {0xA2u, 0xFFu}, + {0xA5u, 0x06u}, + {0xA7u, 0x09u}, + {0xA8u, 0x01u}, + {0xA9u, 0x05u}, + {0xABu, 0x0Au}, + {0xACu, 0xC6u}, + {0xAEu, 0x19u}, + {0xB1u, 0x7Fu}, + {0xB2u, 0x3Fu}, + {0xB4u, 0xC0u}, {0xBAu, 0x20u}, - {0xBEu, 0x04u}, - {0xBFu, 0x10u}, - {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, - {0xDBu, 0x04u}, - {0xDCu, 0x99u}, - {0xDDu, 0x90u}, + {0xDCu, 0x11u}, {0xDFu, 0x01u}, - {0x00u, 0x84u}, - {0x02u, 0x80u}, - {0x03u, 0x04u}, + {0x01u, 0x80u}, + {0x02u, 0x10u}, + {0x03u, 0x08u}, {0x04u, 0x22u}, - {0x07u, 0x10u}, - {0x09u, 0x0Au}, - {0x0Au, 0x08u}, - {0x0Du, 0x02u}, - {0x0Eu, 0x01u}, - {0x0Fu, 0x28u}, - {0x12u, 0x01u}, - {0x15u, 0x40u}, - {0x16u, 0x02u}, - {0x17u, 0x05u}, - {0x18u, 0x04u}, - {0x19u, 0x10u}, - {0x1Au, 0x10u}, + {0x05u, 0x10u}, + {0x06u, 0x20u}, + {0x08u, 0x08u}, + {0x0Bu, 0x09u}, + {0x0Cu, 0x08u}, + {0x0Du, 0x20u}, + {0x0Eu, 0x90u}, + {0x0Fu, 0x02u}, + {0x10u, 0x08u}, + {0x11u, 0x08u}, + {0x12u, 0x40u}, + {0x14u, 0x04u}, + {0x15u, 0x02u}, + {0x16u, 0x42u}, + {0x1Bu, 0x08u}, + {0x1Du, 0x20u}, + {0x1Eu, 0x20u}, {0x1Fu, 0x04u}, - {0x20u, 0x80u}, - {0x21u, 0x28u}, - {0x25u, 0x10u}, + {0x21u, 0x10u}, + {0x22u, 0x44u}, + {0x23u, 0x0Au}, + {0x25u, 0x01u}, + {0x28u, 0x4Au}, {0x2Bu, 0x10u}, - {0x2Cu, 0x01u}, - {0x2Du, 0xA9u}, - {0x32u, 0x84u}, - {0x33u, 0x01u}, - {0x34u, 0x20u}, - {0x37u, 0x08u}, + {0x2Eu, 0x04u}, + {0x2Fu, 0x08u}, + {0x30u, 0x08u}, + {0x31u, 0x10u}, + {0x32u, 0x40u}, + {0x34u, 0x04u}, + {0x36u, 0x16u}, {0x38u, 0x02u}, - {0x3Au, 0x01u}, - {0x3Du, 0x24u}, - {0x3Fu, 0x80u}, - {0x58u, 0x80u}, - {0x5Eu, 0x40u}, - {0x62u, 0x80u}, - {0x66u, 0x80u}, - {0x82u, 0x50u}, - {0x85u, 0x24u}, - {0x86u, 0x04u}, - {0x8Au, 0x42u}, - {0x8Du, 0x08u}, - {0x8Eu, 0x20u}, - {0x8Fu, 0x0Cu}, - {0x90u, 0x02u}, - {0x91u, 0x88u}, - {0x95u, 0x44u}, - {0x96u, 0x04u}, - {0x98u, 0x24u}, - {0x99u, 0xE0u}, - {0x9Eu, 0xE0u}, - {0x9Fu, 0x10u}, - {0xA2u, 0x01u}, - {0xA4u, 0x84u}, - {0xA6u, 0x40u}, - {0xA9u, 0x01u}, - {0xADu, 0x40u}, - {0xAFu, 0x03u}, - {0xB1u, 0x84u}, - {0xB3u, 0x20u}, - {0xB4u, 0x30u}, - {0xB6u, 0x40u}, - {0xC0u, 0x7Fu}, - {0xC2u, 0xFEu}, - {0xC4u, 0xB1u}, - {0xCAu, 0xF2u}, - {0xCCu, 0x6Bu}, - {0xCEu, 0x71u}, - {0xD6u, 0x18u}, - {0xD8u, 0x18u}, - {0xE0u, 0xC9u}, - {0xE2u, 0x06u}, - {0xE4u, 0x40u}, - {0xE6u, 0x81u}, - {0xE8u, 0x40u}, - {0xECu, 0x80u}, - {0x00u, 0x04u}, - {0x01u, 0x04u}, - {0x02u, 0x08u}, - {0x03u, 0x08u}, - {0x06u, 0x02u}, - {0x08u, 0x08u}, - {0x0Au, 0x04u}, - {0x0Cu, 0x08u}, - {0x0Eu, 0x04u}, - {0x0Fu, 0x01u}, - {0x10u, 0x01u}, - {0x12u, 0x02u}, - {0x17u, 0x02u}, - {0x18u, 0x08u}, - {0x1Au, 0x04u}, - {0x1Bu, 0x10u}, - {0x1Fu, 0x08u}, - {0x24u, 0x08u}, - {0x26u, 0x04u}, - {0x2Bu, 0x04u}, - {0x2Eu, 0x01u}, - {0x31u, 0x02u}, - {0x32u, 0x03u}, - {0x33u, 0x10u}, - {0x35u, 0x01u}, - {0x36u, 0x0Cu}, - {0x37u, 0x0Cu}, - {0x3Au, 0x80u}, - {0x3Eu, 0x04u}, + {0x39u, 0x20u}, + {0x3Au, 0x40u}, + {0x3Bu, 0x08u}, + {0x3Du, 0x0Au}, + {0x3Eu, 0x10u}, + {0x58u, 0x10u}, + {0x5Au, 0x40u}, + {0x5Bu, 0x04u}, + {0x60u, 0x08u}, + {0x63u, 0x23u}, + {0x81u, 0x20u}, + {0x86u, 0x48u}, + {0x87u, 0x80u}, + {0x88u, 0x30u}, + {0x89u, 0x02u}, + {0x8Fu, 0x20u}, + {0xC0u, 0x77u}, + {0xC2u, 0xF7u}, + {0xC4u, 0xDEu}, + {0xCAu, 0x6Fu}, + {0xCCu, 0xEEu}, + {0xCEu, 0xEFu}, + {0xD6u, 0x0Eu}, + {0xD8u, 0x0Eu}, + {0xE0u, 0x80u}, + {0xE2u, 0x40u}, + {0xE4u, 0x04u}, + {0xE6u, 0x20u}, + {0x02u, 0x02u}, + {0x06u, 0x30u}, + {0x08u, 0x04u}, + {0x09u, 0x08u}, + {0x0Au, 0x08u}, + {0x0Bu, 0x22u}, + {0x0Cu, 0x01u}, + {0x0Eu, 0x02u}, + {0x10u, 0x20u}, + {0x11u, 0x14u}, + {0x12u, 0x0Cu}, + {0x13u, 0x08u}, + {0x14u, 0x10u}, + {0x15u, 0x09u}, + {0x16u, 0x0Cu}, + {0x17u, 0x10u}, + {0x19u, 0x37u}, + {0x1Au, 0x01u}, + {0x1Eu, 0x04u}, + {0x27u, 0x07u}, + {0x2Au, 0x48u}, + {0x30u, 0x03u}, + {0x34u, 0x3Cu}, + {0x35u, 0x38u}, + {0x36u, 0x40u}, + {0x37u, 0x07u}, + {0x39u, 0x20u}, + {0x3Eu, 0x01u}, {0x3Fu, 0x40u}, - {0x56u, 0x08u}, + {0x40u, 0x24u}, + {0x41u, 0x06u}, + {0x42u, 0x30u}, + {0x44u, 0x01u}, + {0x45u, 0xFEu}, + {0x46u, 0xDCu}, + {0x47u, 0x0Bu}, + {0x48u, 0x1Fu}, + {0x49u, 0xFFu}, + {0x4Au, 0xFFu}, + {0x4Bu, 0xFFu}, + {0x4Cu, 0x22u}, + {0x4Eu, 0xF0u}, + {0x4Fu, 0x08u}, + {0x50u, 0x04u}, {0x58u, 0x04u}, {0x59u, 0x04u}, - {0x5Bu, 0x04u}, - {0x5Cu, 0x99u}, - {0x5Du, 0x90u}, + {0x5Au, 0x04u}, {0x5Fu, 0x01u}, - {0x80u, 0x10u}, - {0x83u, 0x10u}, - {0x84u, 0x0Au}, - {0x86u, 0x05u}, - {0x87u, 0x02u}, - {0x8Bu, 0x04u}, - {0x8Fu, 0x08u}, - {0x93u, 0x01u}, - {0x96u, 0x07u}, - {0x9Au, 0x08u}, - {0xA0u, 0x09u}, - {0xA2u, 0x02u}, - {0xA4u, 0x04u}, - {0xA6u, 0x08u}, - {0xADu, 0x01u}, - {0xAFu, 0x02u}, - {0xB0u, 0x10u}, - {0xB1u, 0x04u}, - {0xB2u, 0x0Fu}, - {0xB3u, 0x10u}, - {0xB5u, 0x03u}, - {0xB7u, 0x08u}, - {0xBEu, 0x01u}, - {0xBFu, 0x10u}, + {0x62u, 0xC0u}, + {0x64u, 0x40u}, + {0x65u, 0x01u}, + {0x66u, 0x10u}, + {0x67u, 0x11u}, + {0x68u, 0xC0u}, + {0x69u, 0x01u}, + {0x6Bu, 0x11u}, + {0x6Cu, 0x40u}, + {0x6Du, 0x01u}, + {0x6Eu, 0x40u}, + {0x6Fu, 0x01u}, + {0x81u, 0x02u}, + {0x83u, 0x09u}, + {0x8Du, 0x02u}, + {0x8Fu, 0x01u}, + {0x91u, 0x02u}, + {0x93u, 0x11u}, + {0x95u, 0x02u}, + {0x97u, 0x05u}, + {0x99u, 0x01u}, + {0x9Bu, 0x02u}, + {0xA8u, 0x01u}, + {0xB1u, 0x10u}, + {0xB2u, 0x01u}, + {0xB3u, 0x03u}, + {0xB5u, 0x08u}, + {0xB7u, 0x04u}, + {0xBBu, 0x08u}, {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x91u}, + {0xDCu, 0x99u}, {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x00u, 0xA1u}, - {0x03u, 0x10u}, - {0x06u, 0xA0u}, - {0x09u, 0x20u}, - {0x0Au, 0x40u}, - {0x0Cu, 0x04u}, - {0x0Eu, 0x10u}, - {0x0Fu, 0x04u}, - {0x11u, 0x40u}, - {0x12u, 0x20u}, - {0x15u, 0x04u}, - {0x16u, 0x40u}, - {0x18u, 0x21u}, - {0x19u, 0x40u}, - {0x1Eu, 0x10u}, - {0x1Fu, 0x0Au}, - {0x20u, 0xA0u}, - {0x21u, 0x08u}, - {0x22u, 0x60u}, - {0x23u, 0x40u}, - {0x24u, 0x50u}, - {0x25u, 0x41u}, - {0x27u, 0x08u}, - {0x2Bu, 0x08u}, - {0x2Eu, 0x40u}, - {0x30u, 0x80u}, - {0x31u, 0x28u}, - {0x35u, 0x01u}, - {0x36u, 0x01u}, - {0x38u, 0x02u}, - {0x3Bu, 0x40u}, - {0x3Cu, 0x58u}, - {0x3Fu, 0x02u}, - {0x58u, 0x40u}, - {0x5Bu, 0x20u}, - {0x5Eu, 0x80u}, - {0x61u, 0x20u}, - {0x63u, 0x02u}, - {0x67u, 0x02u}, - {0x6Cu, 0x01u}, - {0x6Eu, 0x40u}, - {0x81u, 0x01u}, - {0x83u, 0x08u}, - {0x85u, 0x20u}, - {0x86u, 0x04u}, - {0x88u, 0x40u}, - {0x8Bu, 0x04u}, - {0x8Cu, 0x10u}, - {0x8Du, 0x40u}, - {0x8Fu, 0x01u}, - {0xC0u, 0x3Fu}, - {0xC2u, 0x6Au}, - {0xC4u, 0x35u}, - {0xCAu, 0x14u}, - {0xCCu, 0x8Eu}, - {0xCEu, 0xF9u}, - {0xD6u, 0x1Cu}, - {0xD8u, 0x1Cu}, - {0xE2u, 0x50u}, - {0xE4u, 0x30u}, - {0x81u, 0x01u}, - {0x82u, 0xFFu}, - {0x85u, 0x04u}, - {0x86u, 0x60u}, - {0x88u, 0x80u}, - {0x89u, 0x22u}, - {0x8Bu, 0x08u}, - {0x8Cu, 0x90u}, - {0x8Du, 0x10u}, - {0x8Eu, 0x40u}, - {0x91u, 0x01u}, - {0x92u, 0x9Fu}, - {0x94u, 0x7Fu}, - {0x95u, 0x07u}, - {0x96u, 0x80u}, - {0x97u, 0x18u}, - {0x98u, 0xC0u}, - {0x99u, 0x01u}, - {0x9Au, 0x04u}, - {0x9Du, 0x40u}, - {0xA0u, 0xC0u}, - {0xA1u, 0x01u}, - {0xA2u, 0x02u}, - {0xA4u, 0xC0u}, - {0xA5u, 0x01u}, - {0xA6u, 0x08u}, - {0xA8u, 0x1Fu}, - {0xA9u, 0x40u}, - {0xAAu, 0x20u}, - {0xACu, 0xC0u}, - {0xADu, 0x08u}, - {0xAEu, 0x01u}, - {0xAFu, 0x21u}, - {0xB2u, 0xFFu}, - {0xB3u, 0x40u}, - {0xB7u, 0x3Fu}, - {0xB9u, 0x88u}, - {0xBEu, 0x04u}, - {0xBFu, 0x40u}, - {0xD6u, 0x02u}, - {0xD7u, 0x24u}, + {0x00u, 0x04u}, + {0x01u, 0x40u}, + {0x02u, 0x08u}, + {0x03u, 0x40u}, + {0x08u, 0x28u}, + {0x09u, 0x02u}, + {0x0Au, 0x02u}, + {0x10u, 0x08u}, + {0x17u, 0x20u}, + {0x18u, 0x04u}, + {0x19u, 0x01u}, + {0x1Au, 0x02u}, + {0x1Bu, 0x10u}, + {0x1Fu, 0x04u}, + {0x21u, 0x40u}, + {0x22u, 0x10u}, + {0x24u, 0x40u}, + {0x26u, 0x04u}, + {0x27u, 0x2Au}, + {0x2Bu, 0x10u}, + {0x31u, 0x02u}, + {0x32u, 0x18u}, + {0x37u, 0x2Au}, + {0x39u, 0x20u}, + {0x3Cu, 0x40u}, + {0x3Fu, 0x01u}, + {0x40u, 0x0Au}, + {0x41u, 0x12u}, + {0x42u, 0x14u}, + {0x49u, 0x04u}, + {0x4Au, 0x88u}, + {0x50u, 0x08u}, + {0x53u, 0x90u}, + {0x5Cu, 0x80u}, + {0x67u, 0x01u}, + {0x6Eu, 0x02u}, + {0x6Fu, 0x2Au}, + {0x76u, 0x25u}, + {0x77u, 0x40u}, + {0x84u, 0x88u}, + {0x8Au, 0x80u}, + {0x8Cu, 0x02u}, + {0x8Du, 0x41u}, + {0x91u, 0x40u}, + {0x92u, 0x14u}, + {0x97u, 0x28u}, + {0x98u, 0x20u}, + {0x9Du, 0x04u}, + {0x9Eu, 0x25u}, + {0x9Fu, 0x40u}, + {0xA1u, 0x02u}, + {0xA2u, 0x08u}, + {0xA6u, 0x05u}, + {0xA7u, 0xAAu}, + {0xAAu, 0x10u}, + {0xABu, 0x80u}, + {0xB2u, 0x04u}, + {0xB5u, 0x08u}, + {0xB6u, 0x01u}, + {0xC0u, 0x0Fu}, + {0xC2u, 0x0Fu}, + {0xC4u, 0x42u}, + {0xCAu, 0x02u}, + {0xCCu, 0xE7u}, + {0xCEu, 0x94u}, + {0xD0u, 0x0Fu}, + {0xD2u, 0x04u}, + {0xD6u, 0x10u}, + {0xD8u, 0x10u}, + {0xE0u, 0x12u}, + {0xE6u, 0x52u}, + {0xEAu, 0x04u}, + {0x00u, 0x0Fu}, + {0x01u, 0x05u}, + {0x02u, 0xF0u}, + {0x03u, 0x0Au}, + {0x07u, 0xFFu}, + {0x08u, 0xFFu}, + {0x09u, 0x03u}, + {0x0Bu, 0x0Cu}, + {0x0Cu, 0x60u}, + {0x0Du, 0x0Fu}, + {0x0Eu, 0x90u}, + {0x0Fu, 0xF0u}, + {0x11u, 0xFFu}, + {0x12u, 0xFFu}, + {0x14u, 0x03u}, + {0x16u, 0x0Cu}, + {0x19u, 0xFFu}, + {0x1Au, 0xFFu}, + {0x1Cu, 0x05u}, + {0x1Du, 0x09u}, + {0x1Eu, 0x0Au}, + {0x1Fu, 0x06u}, + {0x20u, 0x06u}, + {0x22u, 0x09u}, + {0x24u, 0x30u}, + {0x25u, 0x30u}, + {0x26u, 0xC0u}, + {0x27u, 0xC0u}, + {0x28u, 0x50u}, + {0x29u, 0x50u}, + {0x2Au, 0xA0u}, + {0x2Bu, 0xA0u}, + {0x2Du, 0x90u}, + {0x2Fu, 0x60u}, + {0x30u, 0xFFu}, + {0x31u, 0xFFu}, + {0x3Eu, 0x01u}, + {0x3Fu, 0x01u}, + {0x58u, 0x04u}, + {0x59u, 0x04u}, + {0x5Fu, 0x01u}, + {0x82u, 0x0Au}, + {0x85u, 0x60u}, + {0x87u, 0x90u}, + {0x88u, 0x01u}, + {0x89u, 0x05u}, + {0x8Au, 0x04u}, + {0x8Bu, 0x0Au}, + {0x8Du, 0x0Fu}, + {0x8Fu, 0xF0u}, + {0x90u, 0x01u}, + {0x92u, 0x04u}, + {0x96u, 0x02u}, + {0x98u, 0x05u}, + {0x99u, 0x06u}, + {0x9Bu, 0x09u}, + {0x9Cu, 0x0Au}, + {0x9Du, 0x30u}, + {0x9Fu, 0xC0u}, + {0xA0u, 0x0Au}, + {0xA4u, 0x0Au}, + {0xA5u, 0x03u}, + {0xA7u, 0x0Cu}, + {0xA8u, 0x0Au}, + {0xA9u, 0x50u}, + {0xABu, 0xA0u}, + {0xB0u, 0x04u}, + {0xB2u, 0x08u}, + {0xB4u, 0x02u}, + {0xB5u, 0xFFu}, + {0xB6u, 0x01u}, + {0xBEu, 0x55u}, + {0xBFu, 0x10u}, + {0xD4u, 0x09u}, + {0xD6u, 0x04u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, {0xDFu, 0x01u}, - {0x01u, 0x46u}, + {0x00u, 0x02u}, {0x02u, 0x08u}, - {0x05u, 0x02u}, - {0x07u, 0x19u}, - {0x09u, 0x81u}, - {0x0Au, 0x04u}, - {0x0Cu, 0x20u}, - {0x0Eu, 0x80u}, - {0x0Fu, 0x20u}, - {0x10u, 0x08u}, - {0x12u, 0x21u}, - {0x15u, 0x01u}, - {0x16u, 0x02u}, - {0x17u, 0x24u}, - {0x19u, 0x82u}, - {0x1Au, 0x44u}, - {0x1Bu, 0x11u}, - {0x1Eu, 0x10u}, - {0x21u, 0x04u}, - {0x22u, 0x2Bu}, - {0x23u, 0x3Cu}, - {0x25u, 0x04u}, - {0x26u, 0x80u}, - {0x27u, 0x10u}, - {0x2Bu, 0x91u}, - {0x2Cu, 0x20u}, - {0x2Eu, 0x52u}, - {0x30u, 0x28u}, - {0x31u, 0x80u}, - {0x36u, 0xA8u}, - {0x37u, 0x01u}, + {0x05u, 0x90u}, + {0x06u, 0x80u}, + {0x09u, 0x0Au}, + {0x0Au, 0x05u}, + {0x0Bu, 0x20u}, + {0x0Cu, 0x01u}, + {0x0Fu, 0x19u}, + {0x10u, 0xA0u}, + {0x11u, 0x10u}, + {0x14u, 0x44u}, + {0x15u, 0x04u}, + {0x18u, 0x10u}, + {0x19u, 0x40u}, + {0x1Au, 0x58u}, + {0x1Cu, 0x80u}, + {0x22u, 0x20u}, + {0x26u, 0x02u}, + {0x28u, 0x20u}, + {0x29u, 0x08u}, + {0x2Au, 0x30u}, + {0x2Cu, 0x04u}, + {0x2Du, 0x84u}, + {0x2Fu, 0x2Au}, + {0x31u, 0x20u}, + {0x33u, 0x40u}, + {0x34u, 0x41u}, + {0x35u, 0x11u}, + {0x36u, 0xA0u}, + {0x38u, 0x20u}, {0x39u, 0x40u}, - {0x3Au, 0x01u}, - {0x3Bu, 0x14u}, - {0x3Cu, 0x80u}, - {0x3Du, 0x0Au}, - {0x3Eu, 0x80u}, - {0x3Fu, 0x20u}, - {0x41u, 0x04u}, - {0x42u, 0x44u}, - {0x48u, 0x40u}, - {0x49u, 0x08u}, - {0x4Au, 0x46u}, - {0x51u, 0x80u}, - {0x52u, 0x10u}, - {0x53u, 0x01u}, - {0x67u, 0x08u}, - {0x6Cu, 0x28u}, - {0x6Du, 0x47u}, - {0x6Fu, 0x85u}, - {0x76u, 0x03u}, - {0x88u, 0x10u}, - {0x89u, 0x80u}, - {0x8Eu, 0x04u}, - {0x93u, 0x08u}, - {0x96u, 0x42u}, - {0x97u, 0x02u}, - {0x9Cu, 0x10u}, - {0x9Du, 0x88u}, - {0x9Eu, 0x92u}, - {0x9Fu, 0x21u}, - {0xA4u, 0x28u}, - {0xA5u, 0x01u}, - {0xA7u, 0x11u}, - {0xAAu, 0x01u}, - {0xADu, 0x01u}, - {0xC0u, 0xFFu}, - {0xC2u, 0x7Bu}, - {0xC4u, 0xF7u}, - {0xCAu, 0xFBu}, - {0xCCu, 0xFEu}, - {0xCEu, 0xFFu}, - {0xD0u, 0x07u}, - {0xD2u, 0x0Cu}, - {0xD8u, 0x20u}, - {0xE0u, 0x40u}, - {0xECu, 0x02u}, - {0x01u, 0x1Du}, - {0x04u, 0x04u}, - {0x06u, 0x03u}, - {0x09u, 0x02u}, - {0x0Bu, 0x08u}, - {0x0Du, 0x02u}, - {0x0Fu, 0x04u}, - {0x11u, 0x0Du}, - {0x13u, 0x10u}, - {0x14u, 0x6Du}, - {0x16u, 0x02u}, - {0x19u, 0x01u}, - {0x1Au, 0x10u}, - {0x1Bu, 0x02u}, - {0x1Cu, 0x0Bu}, - {0x1Du, 0x02u}, - {0x1Eu, 0x54u}, - {0x1Fu, 0x0Du}, - {0x21u, 0x1Du}, - {0x25u, 0x1Du}, - {0x28u, 0x09u}, - {0x29u, 0x1Du}, - {0x2Au, 0x36u}, - {0x2Fu, 0x10u}, - {0x31u, 0x0Fu}, - {0x32u, 0x07u}, - {0x34u, 0x70u}, - {0x35u, 0x10u}, - {0x36u, 0x08u}, - {0x3Au, 0x08u}, - {0x3Bu, 0x02u}, - {0x3Eu, 0x40u}, - {0x3Fu, 0x10u}, + {0x3Au, 0x84u}, + {0x3Du, 0x40u}, + {0x3Fu, 0x19u}, + {0x58u, 0x02u}, + {0x59u, 0x04u}, + {0x5Au, 0x60u}, + {0x61u, 0x40u}, + {0x63u, 0x40u}, + {0x80u, 0x12u}, + {0x87u, 0x40u}, + {0x8Du, 0x40u}, + {0x90u, 0x20u}, + {0x91u, 0x50u}, + {0x92u, 0x05u}, + {0x93u, 0x11u}, + {0x97u, 0x08u}, + {0x99u, 0x09u}, + {0x9Du, 0x10u}, + {0x9Eu, 0x15u}, + {0xA0u, 0xA1u}, + {0xA1u, 0x22u}, + {0xA2u, 0x88u}, + {0xA3u, 0x04u}, + {0xA4u, 0x40u}, + {0xA6u, 0x27u}, + {0xA7u, 0xAAu}, + {0xA8u, 0x0Cu}, + {0xABu, 0x20u}, + {0xAEu, 0x04u}, + {0xB0u, 0x01u}, + {0xB5u, 0x14u}, + {0xC0u, 0xDAu}, + {0xC2u, 0xFFu}, + {0xC4u, 0x7Eu}, + {0xCAu, 0x76u}, + {0xCCu, 0xBCu}, + {0xCEu, 0xFEu}, + {0xD6u, 0x0Fu}, + {0xD8u, 0x09u}, + {0xE2u, 0x08u}, + {0xE8u, 0x04u}, + {0xECu, 0x08u}, + {0x00u, 0x10u}, + {0x01u, 0xC0u}, + {0x03u, 0x08u}, + {0x04u, 0x07u}, + {0x05u, 0xC0u}, + {0x06u, 0x18u}, + {0x07u, 0x04u}, + {0x08u, 0x22u}, + {0x0Au, 0x08u}, + {0x0Cu, 0x40u}, + {0x0Du, 0xC0u}, + {0x0Fu, 0x01u}, + {0x10u, 0x40u}, + {0x11u, 0x80u}, + {0x14u, 0x04u}, + {0x17u, 0xFFu}, + {0x18u, 0x01u}, + {0x1Bu, 0x60u}, + {0x1Cu, 0x01u}, + {0x1Fu, 0x9Fu}, + {0x20u, 0x01u}, + {0x21u, 0x1Fu}, + {0x23u, 0x20u}, + {0x24u, 0x08u}, + {0x25u, 0x90u}, + {0x26u, 0x21u}, + {0x27u, 0x40u}, + {0x28u, 0x01u}, + {0x29u, 0xC0u}, + {0x2Bu, 0x02u}, + {0x2Cu, 0x01u}, + {0x2Du, 0x7Fu}, + {0x2Fu, 0x80u}, + {0x30u, 0x3Fu}, + {0x32u, 0x40u}, + {0x37u, 0xFFu}, + {0x38u, 0x0Au}, + {0x3Eu, 0x01u}, + {0x3Fu, 0x40u}, {0x54u, 0x40u}, {0x56u, 0x04u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, {0x5Fu, 0x01u}, - {0x82u, 0xFFu}, - {0x83u, 0x70u}, - {0x84u, 0xFFu}, - {0x85u, 0x99u}, - {0x87u, 0x22u}, - {0x88u, 0x0Fu}, - {0x8Au, 0xF0u}, - {0x8Bu, 0x80u}, - {0x90u, 0xFFu}, - {0x93u, 0x08u}, - {0x96u, 0xFFu}, - {0x97u, 0x07u}, - {0x98u, 0x33u}, - {0x99u, 0xAAu}, - {0x9Au, 0xCCu}, - {0x9Bu, 0x55u}, - {0x9Eu, 0xFFu}, - {0xA8u, 0x69u}, - {0xA9u, 0x44u}, - {0xAAu, 0x96u}, - {0xABu, 0x88u}, - {0xACu, 0x55u}, - {0xAEu, 0xAAu}, - {0xB1u, 0xF0u}, - {0xB2u, 0xFFu}, - {0xB3u, 0x0Fu}, - {0xBAu, 0x08u}, - {0xD4u, 0x09u}, - {0xD6u, 0x04u}, + {0x80u, 0x10u}, + {0x81u, 0x04u}, + {0x82u, 0x20u}, + {0x84u, 0x01u}, + {0x86u, 0x02u}, + {0x8Cu, 0x02u}, + {0x8Eu, 0x09u}, + {0x90u, 0x02u}, + {0x92u, 0x05u}, + {0x94u, 0x02u}, + {0x96u, 0x01u}, + {0x9Cu, 0x02u}, + {0x9Eu, 0x01u}, + {0x9Fu, 0x01u}, + {0xA2u, 0x20u}, + {0xA6u, 0x10u}, + {0xAFu, 0x02u}, + {0xB0u, 0x04u}, + {0xB1u, 0x02u}, + {0xB2u, 0x08u}, + {0xB3u, 0x01u}, + {0xB4u, 0x03u}, + {0xB6u, 0x30u}, + {0xB7u, 0x04u}, + {0xBAu, 0x20u}, + {0xBEu, 0x40u}, + {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x11u}, + {0xDCu, 0x99u}, + {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x01u, 0x01u}, - {0x03u, 0x18u}, - {0x05u, 0x04u}, - {0x08u, 0x04u}, - {0x0Au, 0x81u}, - {0x0Bu, 0x24u}, - {0x0Eu, 0x08u}, - {0x0Fu, 0x22u}, - {0x12u, 0x08u}, - {0x13u, 0x40u}, - {0x17u, 0x20u}, - {0x18u, 0x20u}, - {0x1Bu, 0x08u}, - {0x1Du, 0x84u}, - {0x1Eu, 0x08u}, - {0x1Fu, 0x04u}, - {0x21u, 0x09u}, - {0x25u, 0x20u}, - {0x27u, 0x80u}, - {0x28u, 0x04u}, - {0x2Cu, 0x28u}, - {0x2Eu, 0x02u}, - {0x2Fu, 0x01u}, - {0x30u, 0x02u}, - {0x31u, 0x08u}, - {0x33u, 0x10u}, - {0x37u, 0xA1u}, - {0x39u, 0x1Au}, - {0x3Du, 0x02u}, - {0x3Eu, 0x40u}, - {0x3Fu, 0x20u}, - {0x45u, 0x20u}, - {0x46u, 0x08u}, - {0x58u, 0x10u}, - {0x59u, 0x88u}, - {0x5Au, 0x02u}, - {0x60u, 0x80u}, - {0x61u, 0x80u}, - {0x66u, 0x19u}, - {0x67u, 0x02u}, - {0x82u, 0x04u}, - {0x85u, 0x08u}, - {0x8Cu, 0x80u}, - {0x91u, 0x19u}, - {0x92u, 0x81u}, - {0x93u, 0x64u}, - {0x94u, 0x20u}, - {0x9Bu, 0x10u}, - {0x9Eu, 0x80u}, - {0x9Fu, 0x20u}, + {0x00u, 0x44u}, + {0x01u, 0x02u}, + {0x04u, 0x20u}, + {0x05u, 0x08u}, + {0x07u, 0x81u}, + {0x09u, 0x82u}, + {0x0Au, 0x10u}, + {0x0Eu, 0xA4u}, + {0x0Fu, 0x02u}, + {0x11u, 0x06u}, + {0x14u, 0x04u}, + {0x16u, 0x01u}, + {0x17u, 0x0Au}, + {0x18u, 0x46u}, + {0x1Au, 0x10u}, + {0x1Eu, 0xA0u}, + {0x21u, 0x42u}, + {0x22u, 0x04u}, + {0x27u, 0x01u}, + {0x29u, 0x40u}, + {0x2Cu, 0x06u}, + {0x2Fu, 0xA0u}, + {0x32u, 0x80u}, + {0x36u, 0x10u}, + {0x37u, 0x8Au}, + {0x39u, 0x02u}, + {0x3Eu, 0x06u}, + {0x3Fu, 0x80u}, + {0x5Au, 0x40u}, + {0x61u, 0xC0u}, + {0x64u, 0x20u}, + {0x66u, 0x80u}, + {0x67u, 0x88u}, + {0x87u, 0x40u}, + {0x8Du, 0x02u}, + {0x90u, 0x20u}, + {0x91u, 0x06u}, + {0x92u, 0x44u}, + {0x94u, 0x04u}, + {0x95u, 0x80u}, + {0x96u, 0x08u}, + {0x98u, 0x04u}, + {0x99u, 0x08u}, + {0x9Au, 0x03u}, + {0x9Bu, 0x0Au}, {0xA0u, 0x02u}, - {0xA2u, 0x08u}, - {0xA7u, 0x11u}, - {0xA8u, 0x40u}, - {0xAAu, 0x04u}, - {0xABu, 0x40u}, - {0xB1u, 0x04u}, - {0xB2u, 0x01u}, - {0xB5u, 0x10u}, - {0xC0u, 0x2Eu}, - {0xC2u, 0xEFu}, - {0xC4u, 0x43u}, - {0xCAu, 0xF4u}, - {0xCCu, 0xB7u}, - {0xCEu, 0xB7u}, - {0xD6u, 0x0Fu}, - {0xD8u, 0xF9u}, - {0xE0u, 0x02u}, - {0xE2u, 0x18u}, - {0xEEu, 0x31u}, - {0x39u, 0x20u}, - {0x3Fu, 0x10u}, - {0x59u, 0x04u}, - {0x5Fu, 0x01u}, - {0x27u, 0x08u}, - {0x84u, 0x08u}, - {0x87u, 0x08u}, - {0x97u, 0x40u}, - {0x9Cu, 0x80u}, - {0xA4u, 0x08u}, - {0xB3u, 0x04u}, - {0xEEu, 0x21u}, - {0x88u, 0x80u}, - {0x9Cu, 0x80u}, - {0xAFu, 0x40u}, - {0x12u, 0x08u}, + {0xA2u, 0x80u}, + {0xA3u, 0xE1u}, + {0xAAu, 0x20u}, + {0xABu, 0x08u}, + {0xADu, 0x08u}, + {0xAFu, 0x80u}, + {0xB0u, 0x40u}, + {0xB3u, 0x21u}, + {0xB5u, 0x08u}, + {0xB7u, 0x02u}, + {0xC0u, 0xFDu}, + {0xC2u, 0xFDu}, + {0xC4u, 0xFCu}, + {0xCAu, 0xF8u}, + {0xCCu, 0xF8u}, + {0xCEu, 0xD1u}, + {0xD6u, 0x08u}, + {0xD8u, 0xF8u}, + {0xE0u, 0x40u}, + {0xE8u, 0x80u}, + {0xECu, 0x50u}, + {0xB9u, 0x08u}, + {0xBFu, 0x04u}, + {0xD9u, 0x04u}, + {0xDFu, 0x01u}, + {0x26u, 0x08u}, + {0x87u, 0x80u}, + {0x8Bu, 0x04u}, + {0x97u, 0x08u}, + {0x9Fu, 0x80u}, + {0xA6u, 0x08u}, + {0xAAu, 0x08u}, + {0xB0u, 0x20u}, + {0xB4u, 0x01u}, + {0xB5u, 0x01u}, + {0xB6u, 0x80u}, + {0xE0u, 0x80u}, + {0xE6u, 0x02u}, + {0xE8u, 0x90u}, + {0xECu, 0x10u}, + {0x12u, 0x02u}, {0x16u, 0x80u}, - {0x17u, 0x80u}, + {0x17u, 0x20u}, {0x31u, 0x08u}, - {0x36u, 0x20u}, - {0x37u, 0x04u}, - {0x39u, 0x01u}, - {0x3Au, 0x80u}, - {0x3Cu, 0x04u}, + {0x34u, 0x18u}, + {0x3Au, 0x81u}, + {0x3Eu, 0x01u}, {0x3Fu, 0x20u}, - {0x43u, 0x40u}, - {0x55u, 0x10u}, - {0x59u, 0x04u}, - {0x5Eu, 0x04u}, - {0x61u, 0x10u}, - {0x66u, 0x01u}, - {0x82u, 0x01u}, - {0x86u, 0x04u}, - {0x89u, 0x01u}, + {0x42u, 0x08u}, + {0x53u, 0x01u}, + {0x5Bu, 0x08u}, + {0x5Du, 0x02u}, + {0x62u, 0x20u}, + {0x66u, 0x04u}, + {0x77u, 0x10u}, + {0x7Eu, 0x02u}, {0xC4u, 0xE0u}, {0xCCu, 0xE0u}, {0xCEu, 0xF0u}, {0xD0u, 0x10u}, - {0xD4u, 0x40u}, + {0xD4u, 0x80u}, {0xD6u, 0xC0u}, {0xD8u, 0xC0u}, - {0xE2u, 0x60u}, - {0x32u, 0x08u}, + {0x30u, 0x02u}, {0x33u, 0x10u}, - {0x35u, 0x01u}, - {0x37u, 0x80u}, - {0x3Bu, 0x10u}, - {0x50u, 0x40u}, - {0x57u, 0x80u}, - {0x5Bu, 0x20u}, - {0x5Eu, 0x01u}, - {0x81u, 0x10u}, - {0x8Cu, 0x40u}, - {0x8Fu, 0x80u}, - {0x94u, 0x04u}, - {0x9Bu, 0x90u}, - {0x9Du, 0x14u}, - {0x9Fu, 0x44u}, - {0xA5u, 0x18u}, + {0x34u, 0x02u}, + {0x37u, 0x20u}, + {0x3Bu, 0x20u}, + {0x57u, 0x20u}, + {0x5Au, 0x80u}, + {0x5Eu, 0x10u}, + {0x66u, 0x80u}, + {0x82u, 0x30u}, + {0x84u, 0x02u}, + {0x8Au, 0x80u}, + {0x96u, 0x01u}, + {0x97u, 0x02u}, + {0x9Bu, 0x30u}, + {0x9Cu, 0x18u}, + {0x9Du, 0x02u}, + {0x9Eu, 0x0Cu}, + {0x9Fu, 0x08u}, + {0xA5u, 0x08u}, {0xA6u, 0x20u}, - {0xAAu, 0x08u}, - {0xABu, 0x10u}, - {0xB7u, 0x10u}, + {0xA7u, 0x10u}, + {0xB6u, 0x01u}, {0xCCu, 0xF0u}, {0xCEu, 0x10u}, - {0xD4u, 0xE0u}, - {0xD6u, 0x80u}, - {0xE6u, 0x20u}, - {0x12u, 0x20u}, + {0xD4u, 0xC0u}, + {0xD6u, 0xA0u}, + {0xE2u, 0x80u}, + {0xE6u, 0xC0u}, + {0x10u, 0x10u}, {0x30u, 0x20u}, - {0x81u, 0x10u}, - {0x88u, 0x20u}, - {0x8Du, 0x04u}, - {0x94u, 0x04u}, - {0x97u, 0x10u}, - {0x9Du, 0x05u}, - {0x9Fu, 0x44u}, - {0xA5u, 0x18u}, - {0xA6u, 0x28u}, - {0xABu, 0x20u}, - {0xAEu, 0x01u}, + {0x80u, 0x02u}, + {0x82u, 0x04u}, + {0x88u, 0x08u}, + {0x8Du, 0x80u}, + {0x8Fu, 0x20u}, + {0x96u, 0x81u}, + {0x97u, 0x22u}, + {0x9Cu, 0x18u}, + {0x9Eu, 0x0Cu}, + {0x9Fu, 0x08u}, + {0xA4u, 0x02u}, + {0xA5u, 0x08u}, + {0xA7u, 0x20u}, + {0xABu, 0x10u}, + {0xB1u, 0x02u}, {0xC4u, 0x10u}, {0xCCu, 0x10u}, - {0xE2u, 0x80u}, - {0xEAu, 0x90u}, - {0x81u, 0x01u}, - {0x83u, 0x04u}, - {0x87u, 0x10u}, - {0x94u, 0x04u}, - {0x97u, 0x10u}, - {0x9Du, 0x01u}, - {0x9Fu, 0x44u}, + {0xE2u, 0xA0u}, + {0xEEu, 0x80u}, + {0x81u, 0x08u}, + {0x83u, 0x01u}, + {0x96u, 0x01u}, + {0x97u, 0x02u}, + {0x9Eu, 0x08u}, + {0x9Fu, 0x08u}, + {0xA1u, 0x80u}, {0xA5u, 0x08u}, - {0xAAu, 0x08u}, - {0xE2u, 0xB0u}, - {0xEAu, 0x20u}, - {0x08u, 0x20u}, - {0x0Bu, 0x40u}, - {0x0Eu, 0x20u}, - {0x11u, 0x02u}, - {0x16u, 0x10u}, - {0x50u, 0x08u}, - {0x54u, 0x80u}, - {0x5Bu, 0x40u}, - {0x5Du, 0x80u}, - {0x88u, 0x20u}, + {0xACu, 0x20u}, + {0xB3u, 0x10u}, + {0xB6u, 0x40u}, + {0xE2u, 0x80u}, + {0xE6u, 0x20u}, + {0xEAu, 0x40u}, + {0x08u, 0x28u}, + {0x0Fu, 0x20u}, + {0x13u, 0x01u}, + {0x17u, 0x08u}, + {0x53u, 0x21u}, + {0x55u, 0x08u}, + {0x5Cu, 0x40u}, + {0x83u, 0x01u}, + {0x8Bu, 0x10u}, {0xC2u, 0x0Eu}, {0xC4u, 0x0Cu}, {0xD4u, 0x07u}, {0xD6u, 0x04u}, - {0xE2u, 0x01u}, - {0x02u, 0x08u}, - {0x03u, 0x40u}, - {0x07u, 0x28u}, - {0x08u, 0x02u}, - {0x09u, 0x80u}, - {0x0Cu, 0x02u}, + {0xE2u, 0x04u}, + {0x01u, 0x82u}, + {0x06u, 0x08u}, + {0x07u, 0x20u}, + {0x08u, 0x80u}, + {0x0Bu, 0x20u}, {0x0Eu, 0x01u}, - {0x80u, 0x0Au}, - {0x81u, 0x01u}, - {0x85u, 0x80u}, - {0x87u, 0x20u}, - {0x88u, 0x02u}, - {0x8Au, 0x08u}, - {0x93u, 0x40u}, - {0x9Du, 0x80u}, - {0xA1u, 0x01u}, - {0xA2u, 0x10u}, - {0xA4u, 0x08u}, - {0xB2u, 0x10u}, - {0xB4u, 0x80u}, - {0xB7u, 0x40u}, + {0x0Fu, 0x80u}, + {0x83u, 0x10u}, + {0x84u, 0x20u}, + {0x85u, 0x01u}, + {0x94u, 0x40u}, + {0x97u, 0x20u}, + {0x98u, 0x28u}, + {0x9Bu, 0x08u}, + {0xA3u, 0x10u}, + {0xA5u, 0x08u}, + {0xA7u, 0x60u}, + {0xABu, 0x41u}, {0xC0u, 0x0Fu}, {0xC2u, 0x0Fu}, + {0x82u, 0x40u}, + {0x83u, 0x20u}, + {0x8Au, 0x08u}, + {0x94u, 0x40u}, + {0x95u, 0x02u}, + {0x98u, 0x08u}, + {0x9Au, 0x08u}, + {0x9Bu, 0x28u}, + {0xA7u, 0x20u}, + {0xA9u, 0x0Au}, + {0xB2u, 0x01u}, + {0xB4u, 0x80u}, + {0xB5u, 0x80u}, {0xE2u, 0x04u}, - {0xE6u, 0x01u}, - {0xE8u, 0x08u}, - {0xECu, 0x02u}, - {0xEEu, 0x04u}, - {0x81u, 0x80u}, - {0x89u, 0x10u}, - {0x8Au, 0x10u}, - {0x92u, 0x01u}, - {0x9Bu, 0x40u}, - {0xA1u, 0x80u}, - {0xA2u, 0x10u}, - {0xAFu, 0x40u}, - {0xB3u, 0x08u}, - {0xE2u, 0x01u}, - {0xE6u, 0x04u}, - {0xEEu, 0x01u}, - {0x09u, 0x04u}, - {0x0Au, 0x01u}, - {0x0Du, 0x10u}, - {0x0Fu, 0x80u}, - {0x83u, 0x40u}, - {0x86u, 0x01u}, - {0x95u, 0x20u}, - {0x9Bu, 0x40u}, - {0xA5u, 0x04u}, - {0xA9u, 0x04u}, - {0xAEu, 0x01u}, + {0xEAu, 0x08u}, + {0xEEu, 0x03u}, + {0x08u, 0x10u}, + {0x0Au, 0x40u}, + {0x0Du, 0x01u}, + {0x0Eu, 0x04u}, + {0x83u, 0x08u}, + {0x94u, 0x40u}, + {0x95u, 0x02u}, + {0x96u, 0x44u}, + {0x9Bu, 0x08u}, + {0x9Cu, 0x10u}, + {0xABu, 0x20u}, + {0xAEu, 0x04u}, + {0xB0u, 0x10u}, + {0xB4u, 0x08u}, {0xC2u, 0x0Fu}, - {0x67u, 0x80u}, - {0x82u, 0x02u}, - {0x87u, 0x40u}, - {0x8Fu, 0x40u}, - {0x94u, 0x04u}, - {0x9Fu, 0x40u}, - {0xA2u, 0x02u}, - {0xB1u, 0x08u}, - {0xB6u, 0x02u}, + {0xEAu, 0x06u}, + {0x65u, 0x01u}, + {0x86u, 0x09u}, + {0x96u, 0x01u}, + {0x9Eu, 0x08u}, + {0x9Fu, 0x08u}, + {0xA1u, 0x80u}, {0xD8u, 0x80u}, {0xE2u, 0x10u}, - {0xE6u, 0x20u}, - {0x04u, 0x02u}, - {0x52u, 0x02u}, - {0x56u, 0x02u}, - {0x8Cu, 0x01u}, - {0x9Au, 0x02u}, - {0xA2u, 0x02u}, - {0xA8u, 0x04u}, + {0xE6u, 0x40u}, + {0x04u, 0x08u}, + {0x51u, 0x80u}, + {0x56u, 0x80u}, + {0x8Cu, 0x04u}, + {0x8Eu, 0x80u}, + {0x8Fu, 0x08u}, + {0x9Fu, 0x08u}, + {0xA1u, 0x80u}, + {0xA9u, 0x01u}, {0xC0u, 0x20u}, - {0xD4u, 0x80u}, - {0xD6u, 0x20u}, + {0xD4u, 0x60u}, {0xEAu, 0x20u}, - {0xABu, 0x40u}, - {0x01u, 0x04u}, - {0x89u, 0x04u}, + {0x94u, 0x40u}, + {0x00u, 0x08u}, + {0x84u, 0x04u}, + {0xB4u, 0x40u}, {0xC0u, 0x08u}, - {0xE2u, 0x04u}, - {0x10u, 0x03u}, - {0x1Au, 0x03u}, + {0xE8u, 0x02u}, + {0x10u, 0x01u}, + {0x11u, 0x01u}, + {0x1Au, 0x01u}, + {0x1Bu, 0x01u}, + {0x1Cu, 0x01u}, + {0x1Du, 0x01u}, {0x00u, 0xFDu}, {0x01u, 0xBFu}, {0x02u, 0x2Au}, @@ -2065,30 +2233,18 @@ void cyfitter_cfg(void) {(void CYFAR *)(CYREG_TMR0_CFG0), 12u}, {(void CYFAR *)(CYREG_PRT1_DR), 16u}, {(void CYFAR *)(CYDEV_UCFG_B0_P0_U0_BASE), 4096u}, - {(void CYFAR *)(CYDEV_UCFG_B1_P2_U1_BASE), 1920u}, + {(void CYFAR *)(CYDEV_UCFG_B1_P2_U0_BASE), 2048u}, {(void CYFAR *)(CYDEV_UCFG_DSI0_BASE), 2560u}, {(void CYFAR *)(CYDEV_UCFG_DSI12_BASE), 512u}, {(void CYFAR *)(CYREG_BCTL1_MDCLK_EN), 16u}, }; - /* UDB_1_0_0_CONFIG Address: CYDEV_UCFG_B1_P2_U0_BASE Size (bytes): 128 */ - static const uint8 CYCODE BS_UDB_1_0_0_CONFIG_VAL[] = { - 0x39u, 0x71u, 0x06u, 0x00u, 0x42u, 0x12u, 0x04u, 0x01u, 0x77u, 0x05u, 0x08u, 0x0Au, 0x46u, 0x30u, 0x00u, 0x41u, - 0x46u, 0x00u, 0x00u, 0x00u, 0x00u, 0x41u, 0x00u, 0x30u, 0x01u, 0x51u, 0x5Eu, 0x20u, 0x04u, 0x20u, 0x20u, 0x00u, - 0x00u, 0x71u, 0x00u, 0x00u, 0x42u, 0x03u, 0x00u, 0x3Cu, 0x00u, 0x00u, 0x46u, 0x00u, 0x46u, 0x06u, 0x00u, 0x39u, - 0x0Fu, 0x40u, 0x00u, 0x3Cu, 0x70u, 0x03u, 0x08u, 0x00u, 0x02u, 0x00u, 0x30u, 0x20u, 0x00u, 0x00u, 0x40u, 0x01u, - 0x42u, 0x03u, 0x50u, 0x00u, 0x06u, 0xBEu, 0xFCu, 0xD0u, 0x2Fu, 0xFFu, 0xFFu, 0xFFu, 0x22u, 0x00u, 0xF0u, 0x08u, - 0x04u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x04u, 0x04u, 0x04u, 0x00u, 0x00u, 0x00u, 0x00u, 0x01u, - 0x00u, 0x00u, 0xC0u, 0x00u, 0x40u, 0x01u, 0x10u, 0x11u, 0xC0u, 0x01u, 0x00u, 0x11u, 0x40u, 0x01u, 0x40u, 0x01u, - 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}; - /* UCFG_BCTL0 Address: CYREG_BCTL0_MDCLK_EN Size (bytes): 16 */ static const uint8 CYCODE BS_UCFG_BCTL0_VAL[] = { - 0x03u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x02u, 0x01u, 0x03u, 0x01u, 0x02u, 0x01u, 0x02u, 0x01u}; + 0x03u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x02u, 0x01u, 0x03u, 0x01u, 0x01u, 0x01u, 0x02u, 0x01u}; static const cfg_memcpy_t CYCODE cfg_memcpy_list [] = { /* dest, src, size */ - {(void CYFAR *)(CYDEV_UCFG_B1_P2_U0_BASE), BS_UDB_1_0_0_CONFIG_VAL, 128u}, {(void CYFAR *)(CYREG_BCTL0_MDCLK_EN), BS_UCFG_BCTL0_VAL, 16u}, }; diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h index cc5db3c7..03118c3d 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cyfitter_cfg.h +* File Name: cyfitter_cfg.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides basic startup and mux configration settings * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc index 6802241d..0907392f 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc @@ -4,6 +4,7 @@ .include "cydevicegnu_trm.inc" /* LED1 */ +.set LED1__0__INTTYPE, CYREG_PICU12_INTTYPE3 .set LED1__0__MASK, 0x08 .set LED1__0__PC, CYREG_PRT12_PC3 .set LED1__0__PORT, 12 @@ -17,6 +18,7 @@ .set LED1__DM2, CYREG_PRT12_DM2 .set LED1__DR, CYREG_PRT12_DR .set LED1__INP_DIS, CYREG_PRT12_INP_DIS +.set LED1__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU12_BASE .set LED1__MASK, 0x08 .set LED1__PORT, 12 .set LED1__PRT, CYREG_PRT12_PRT @@ -35,6 +37,7 @@ .set LED1__SLW, CYREG_PRT12_SLW /* SD_CD */ +.set SD_CD__0__INTTYPE, CYREG_PICU3_INTTYPE6 .set SD_CD__0__MASK, 0x40 .set SD_CD__0__PC, CYREG_PRT3_PC6 .set SD_CD__0__PORT, 3 @@ -50,6 +53,7 @@ .set SD_CD__DM2, CYREG_PRT3_DM2 .set SD_CD__DR, CYREG_PRT3_DR .set SD_CD__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_CD__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_CD__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_CD__LCD_EN, CYREG_PRT3_LCD_EN .set SD_CD__MASK, 0x40 @@ -67,6 +71,7 @@ .set SD_CD__SLW, CYREG_PRT3_SLW /* SD_CS */ +.set SD_CS__0__INTTYPE, CYREG_PICU3_INTTYPE4 .set SD_CS__0__MASK, 0x10 .set SD_CS__0__PC, CYREG_PRT3_PC4 .set SD_CS__0__PORT, 3 @@ -82,6 +87,7 @@ .set SD_CS__DM2, CYREG_PRT3_DM2 .set SD_CS__DR, CYREG_PRT3_DR .set SD_CS__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_CS__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_CS__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_CS__LCD_EN, CYREG_PRT3_LCD_EN .set SD_CS__MASK, 0x10 @@ -119,6 +125,7 @@ .set USBFS_bus_reset__INTC_SET_PD_REG, CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +.set USBFS_Dm__0__INTTYPE, CYREG_PICU15_INTTYPE7 .set USBFS_Dm__0__MASK, 0x80 .set USBFS_Dm__0__PC, CYREG_IO_PC_PRT15_7_6_PC1 .set USBFS_Dm__0__PORT, 15 @@ -134,6 +141,7 @@ .set USBFS_Dm__DM2, CYREG_PRT15_DM2 .set USBFS_Dm__DR, CYREG_PRT15_DR .set USBFS_Dm__INP_DIS, CYREG_PRT15_INP_DIS +.set USBFS_Dm__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU15_BASE .set USBFS_Dm__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set USBFS_Dm__LCD_EN, CYREG_PRT15_LCD_EN .set USBFS_Dm__MASK, 0x80 @@ -151,6 +159,7 @@ .set USBFS_Dm__SLW, CYREG_PRT15_SLW /* USBFS_Dp */ +.set USBFS_Dp__0__INTTYPE, CYREG_PICU15_INTTYPE6 .set USBFS_Dp__0__MASK, 0x40 .set USBFS_Dp__0__PC, CYREG_IO_PC_PRT15_7_6_PC0 .set USBFS_Dp__0__PORT, 15 @@ -167,6 +176,7 @@ .set USBFS_Dp__DR, CYREG_PRT15_DR .set USBFS_Dp__INP_DIS, CYREG_PRT15_INP_DIS .set USBFS_Dp__INTSTAT, CYREG_PICU15_INTSTAT +.set USBFS_Dp__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU15_BASE .set USBFS_Dp__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set USBFS_Dp__LCD_EN, CYREG_PRT15_LCD_EN .set USBFS_Dp__MASK, 0x40 @@ -381,34 +391,34 @@ .set USBFS_USB__USBIO_CR1, CYREG_USB_USBIO_CR1 /* SDCard_BSPIM */ -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG, CYREG_B1_UDB05_06_ACTL -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG, CYREG_B1_UDB05_06_CTL -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG, CYREG_B1_UDB05_06_CTL -.set SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG, CYREG_B1_UDB05_06_CTL -.set SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG, CYREG_B1_UDB05_06_CTL -.set SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG, CYREG_B1_UDB05_06_MSK -.set SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG, CYREG_B1_UDB05_06_MSK -.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG, CYREG_B1_UDB05_06_MSK -.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG, CYREG_B1_UDB05_06_MSK -.set SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG, CYREG_B1_UDB05_ACTL -.set SDCard_BSPIM_BitCounter__CONTROL_REG, CYREG_B1_UDB05_CTL -.set SDCard_BSPIM_BitCounter__CONTROL_ST_REG, CYREG_B1_UDB05_ST_CTL -.set SDCard_BSPIM_BitCounter__COUNT_REG, CYREG_B1_UDB05_CTL -.set SDCard_BSPIM_BitCounter__COUNT_ST_REG, CYREG_B1_UDB05_ST_CTL -.set SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL -.set SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL -.set SDCard_BSPIM_BitCounter__PERIOD_REG, CYREG_B1_UDB05_MSK -.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG, CYREG_B1_UDB05_06_ACTL -.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG, CYREG_B1_UDB05_06_ST -.set SDCard_BSPIM_BitCounter_ST__MASK_REG, CYREG_B1_UDB05_MSK -.set SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL -.set SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG, CYREG_B1_UDB05_ACTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG, CYREG_B1_UDB05_ST_CTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG, CYREG_B1_UDB05_ST_CTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_REG, CYREG_B1_UDB05_ST -.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B1_UDB06_07_ACTL -.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG, CYREG_B1_UDB06_07_ST +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB07_08_ACTL +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB07_08_CTL +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB07_08_CTL +.set SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB07_08_CTL +.set SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB07_08_CTL +.set SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG, CYREG_B0_UDB07_08_MSK +.set SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB07_08_MSK +.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB07_08_MSK +.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB07_08_MSK +.set SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG, CYREG_B0_UDB07_ACTL +.set SDCard_BSPIM_BitCounter__CONTROL_REG, CYREG_B0_UDB07_CTL +.set SDCard_BSPIM_BitCounter__CONTROL_ST_REG, CYREG_B0_UDB07_ST_CTL +.set SDCard_BSPIM_BitCounter__COUNT_REG, CYREG_B0_UDB07_CTL +.set SDCard_BSPIM_BitCounter__COUNT_ST_REG, CYREG_B0_UDB07_ST_CTL +.set SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB07_MSK_ACTL +.set SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB07_MSK_ACTL +.set SDCard_BSPIM_BitCounter__PERIOD_REG, CYREG_B0_UDB07_MSK +.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB07_08_ACTL +.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG, CYREG_B0_UDB07_08_ST +.set SDCard_BSPIM_BitCounter_ST__MASK_REG, CYREG_B0_UDB07_MSK +.set SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG, CYREG_B0_UDB07_MSK_ACTL +.set SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG, CYREG_B0_UDB07_MSK_ACTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG, CYREG_B0_UDB07_ACTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG, CYREG_B0_UDB07_ST_CTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG, CYREG_B0_UDB07_ST_CTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_REG, CYREG_B0_UDB07_ST +.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B1_UDB08_09_ACTL +.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG, CYREG_B1_UDB08_09_ST .set SDCard_BSPIM_RxStsReg__4__MASK, 0x10 .set SDCard_BSPIM_RxStsReg__4__POS, 4 .set SDCard_BSPIM_RxStsReg__5__MASK, 0x20 @@ -416,9 +426,9 @@ .set SDCard_BSPIM_RxStsReg__6__MASK, 0x40 .set SDCard_BSPIM_RxStsReg__6__POS, 6 .set SDCard_BSPIM_RxStsReg__MASK, 0x70 -.set SDCard_BSPIM_RxStsReg__MASK_REG, CYREG_B1_UDB06_MSK -.set SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG, CYREG_B1_UDB06_ACTL -.set SDCard_BSPIM_RxStsReg__STATUS_REG, CYREG_B1_UDB06_ST +.set SDCard_BSPIM_RxStsReg__MASK_REG, CYREG_B1_UDB08_MSK +.set SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG, CYREG_B1_UDB08_ACTL +.set SDCard_BSPIM_RxStsReg__STATUS_REG, CYREG_B1_UDB08_ST .set SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG, CYREG_B1_UDB04_05_A0 .set SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG, CYREG_B1_UDB04_05_A1 .set SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG, CYREG_B1_UDB04_05_D0 @@ -454,6 +464,7 @@ .set SDCard_BSPIM_TxStsReg__STATUS_REG, CYREG_B1_UDB07_ST /* SD_SCK */ +.set SD_SCK__0__INTTYPE, CYREG_PICU3_INTTYPE2 .set SD_SCK__0__MASK, 0x04 .set SD_SCK__0__PC, CYREG_PRT3_PC2 .set SD_SCK__0__PORT, 3 @@ -469,6 +480,7 @@ .set SD_SCK__DM2, CYREG_PRT3_DM2 .set SD_SCK__DR, CYREG_PRT3_DR .set SD_SCK__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_SCK__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_SCK__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_SCK__LCD_EN, CYREG_PRT3_LCD_EN .set SD_SCK__MASK, 0x04 @@ -497,6 +509,7 @@ .set SCSI_In__0__DM2, CYREG_PRT2_DM2 .set SCSI_In__0__DR, CYREG_PRT2_DR .set SCSI_In__0__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In__0__INTTYPE, CYREG_PICU2_INTTYPE0 .set SCSI_In__0__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In__0__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In__0__MASK, 0x01 @@ -524,6 +537,7 @@ .set SCSI_In__1__DM2, CYREG_PRT6_DM2 .set SCSI_In__1__DR, CYREG_PRT6_DR .set SCSI_In__1__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In__1__INTTYPE, CYREG_PICU6_INTTYPE7 .set SCSI_In__1__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In__1__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In__1__MASK, 0x80 @@ -551,6 +565,7 @@ .set SCSI_In__2__DM2, CYREG_PRT5_DM2 .set SCSI_In__2__DR, CYREG_PRT5_DR .set SCSI_In__2__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__2__INTTYPE, CYREG_PICU5_INTTYPE1 .set SCSI_In__2__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__2__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__2__MASK, 0x02 @@ -578,6 +593,7 @@ .set SCSI_In__3__DM2, CYREG_PRT5_DM2 .set SCSI_In__3__DR, CYREG_PRT5_DR .set SCSI_In__3__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__3__INTTYPE, CYREG_PICU5_INTTYPE2 .set SCSI_In__3__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__3__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__3__MASK, 0x04 @@ -605,6 +621,7 @@ .set SCSI_In__4__DM2, CYREG_PRT5_DM2 .set SCSI_In__4__DR, CYREG_PRT5_DR .set SCSI_In__4__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__4__INTTYPE, CYREG_PICU5_INTTYPE3 .set SCSI_In__4__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__4__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__4__MASK, 0x08 @@ -632,6 +649,7 @@ .set SCSI_In__CD__DM2, CYREG_PRT5_DM2 .set SCSI_In__CD__DR, CYREG_PRT5_DR .set SCSI_In__CD__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__CD__INTTYPE, CYREG_PICU5_INTTYPE1 .set SCSI_In__CD__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__CD__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__CD__MASK, 0x02 @@ -659,6 +677,7 @@ .set SCSI_In__DBP__DM2, CYREG_PRT2_DM2 .set SCSI_In__DBP__DR, CYREG_PRT2_DR .set SCSI_In__DBP__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In__DBP__INTTYPE, CYREG_PICU2_INTTYPE0 .set SCSI_In__DBP__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In__DBP__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In__DBP__MASK, 0x01 @@ -686,6 +705,7 @@ .set SCSI_In__IO__DM2, CYREG_PRT5_DM2 .set SCSI_In__IO__DR, CYREG_PRT5_DR .set SCSI_In__IO__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__IO__INTTYPE, CYREG_PICU5_INTTYPE3 .set SCSI_In__IO__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__IO__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__IO__MASK, 0x08 @@ -713,6 +733,7 @@ .set SCSI_In__MSG__DM2, CYREG_PRT6_DM2 .set SCSI_In__MSG__DR, CYREG_PRT6_DR .set SCSI_In__MSG__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In__MSG__INTTYPE, CYREG_PICU6_INTTYPE7 .set SCSI_In__MSG__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In__MSG__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In__MSG__MASK, 0x80 @@ -740,6 +761,7 @@ .set SCSI_In__REQ__DM2, CYREG_PRT5_DM2 .set SCSI_In__REQ__DR, CYREG_PRT5_DR .set SCSI_In__REQ__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In__REQ__INTTYPE, CYREG_PICU5_INTTYPE2 .set SCSI_In__REQ__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In__REQ__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In__REQ__MASK, 0x04 @@ -767,6 +789,7 @@ .set SCSI_In_DBx__0__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__0__DR, CYREG_PRT12_DR .set SCSI_In_DBx__0__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__0__INTTYPE, CYREG_PICU12_INTTYPE4 .set SCSI_In_DBx__0__MASK, 0x10 .set SCSI_In_DBx__0__PC, CYREG_PRT12_PC4 .set SCSI_In_DBx__0__PORT, 12 @@ -795,6 +818,7 @@ .set SCSI_In_DBx__1__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__1__DR, CYREG_PRT2_DR .set SCSI_In_DBx__1__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__1__INTTYPE, CYREG_PICU2_INTTYPE7 .set SCSI_In_DBx__1__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__1__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__1__MASK, 0x80 @@ -822,6 +846,7 @@ .set SCSI_In_DBx__2__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__2__DR, CYREG_PRT2_DR .set SCSI_In_DBx__2__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__2__INTTYPE, CYREG_PICU2_INTTYPE6 .set SCSI_In_DBx__2__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__2__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__2__MASK, 0x40 @@ -849,6 +874,7 @@ .set SCSI_In_DBx__3__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__3__DR, CYREG_PRT2_DR .set SCSI_In_DBx__3__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__3__INTTYPE, CYREG_PICU2_INTTYPE5 .set SCSI_In_DBx__3__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__3__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__3__MASK, 0x20 @@ -876,6 +902,7 @@ .set SCSI_In_DBx__4__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__4__DR, CYREG_PRT2_DR .set SCSI_In_DBx__4__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__4__INTTYPE, CYREG_PICU2_INTTYPE4 .set SCSI_In_DBx__4__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__4__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__4__MASK, 0x10 @@ -903,6 +930,7 @@ .set SCSI_In_DBx__5__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__5__DR, CYREG_PRT2_DR .set SCSI_In_DBx__5__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__5__INTTYPE, CYREG_PICU2_INTTYPE3 .set SCSI_In_DBx__5__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__5__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__5__MASK, 0x08 @@ -930,6 +958,7 @@ .set SCSI_In_DBx__6__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__6__DR, CYREG_PRT2_DR .set SCSI_In_DBx__6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__6__INTTYPE, CYREG_PICU2_INTTYPE2 .set SCSI_In_DBx__6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__6__MASK, 0x04 @@ -957,6 +986,7 @@ .set SCSI_In_DBx__7__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__7__DR, CYREG_PRT2_DR .set SCSI_In_DBx__7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__7__INTTYPE, CYREG_PICU2_INTTYPE1 .set SCSI_In_DBx__7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__7__MASK, 0x02 @@ -982,6 +1012,7 @@ .set SCSI_In_DBx__DB0__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__DB0__DR, CYREG_PRT12_DR .set SCSI_In_DBx__DB0__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__DB0__INTTYPE, CYREG_PICU12_INTTYPE4 .set SCSI_In_DBx__DB0__MASK, 0x10 .set SCSI_In_DBx__DB0__PC, CYREG_PRT12_PC4 .set SCSI_In_DBx__DB0__PORT, 12 @@ -1010,6 +1041,7 @@ .set SCSI_In_DBx__DB1__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB1__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB1__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB1__INTTYPE, CYREG_PICU2_INTTYPE7 .set SCSI_In_DBx__DB1__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB1__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB1__MASK, 0x80 @@ -1037,6 +1069,7 @@ .set SCSI_In_DBx__DB2__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB2__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB2__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB2__INTTYPE, CYREG_PICU2_INTTYPE6 .set SCSI_In_DBx__DB2__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB2__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB2__MASK, 0x40 @@ -1064,6 +1097,7 @@ .set SCSI_In_DBx__DB3__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB3__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB3__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB3__INTTYPE, CYREG_PICU2_INTTYPE5 .set SCSI_In_DBx__DB3__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB3__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB3__MASK, 0x20 @@ -1091,6 +1125,7 @@ .set SCSI_In_DBx__DB4__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB4__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB4__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB4__INTTYPE, CYREG_PICU2_INTTYPE4 .set SCSI_In_DBx__DB4__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB4__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB4__MASK, 0x10 @@ -1118,6 +1153,7 @@ .set SCSI_In_DBx__DB5__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB5__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB5__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB5__INTTYPE, CYREG_PICU2_INTTYPE3 .set SCSI_In_DBx__DB5__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB5__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB5__MASK, 0x08 @@ -1145,6 +1181,7 @@ .set SCSI_In_DBx__DB6__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB6__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB6__INTTYPE, CYREG_PICU2_INTTYPE2 .set SCSI_In_DBx__DB6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB6__MASK, 0x04 @@ -1172,6 +1209,7 @@ .set SCSI_In_DBx__DB7__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB7__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB7__INTTYPE, CYREG_PICU2_INTTYPE1 .set SCSI_In_DBx__DB7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB7__MASK, 0x02 @@ -1190,6 +1228,7 @@ .set SCSI_In_DBx__DB7__SLW, CYREG_PRT2_SLW /* SD_DAT1 */ +.set SD_DAT1__0__INTTYPE, CYREG_PICU3_INTTYPE0 .set SD_DAT1__0__MASK, 0x01 .set SD_DAT1__0__PC, CYREG_PRT3_PC0 .set SD_DAT1__0__PORT, 3 @@ -1205,6 +1244,7 @@ .set SD_DAT1__DM2, CYREG_PRT3_DM2 .set SD_DAT1__DR, CYREG_PRT3_DR .set SD_DAT1__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_DAT1__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_DAT1__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_DAT1__LCD_EN, CYREG_PRT3_LCD_EN .set SD_DAT1__MASK, 0x01 @@ -1222,6 +1262,7 @@ .set SD_DAT1__SLW, CYREG_PRT3_SLW /* SD_DAT2 */ +.set SD_DAT2__0__INTTYPE, CYREG_PICU3_INTTYPE5 .set SD_DAT2__0__MASK, 0x20 .set SD_DAT2__0__PC, CYREG_PRT3_PC5 .set SD_DAT2__0__PORT, 3 @@ -1237,6 +1278,7 @@ .set SD_DAT2__DM2, CYREG_PRT3_DM2 .set SD_DAT2__DR, CYREG_PRT3_DR .set SD_DAT2__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_DAT2__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_DAT2__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_DAT2__LCD_EN, CYREG_PRT3_LCD_EN .set SD_DAT2__MASK, 0x20 @@ -1254,6 +1296,7 @@ .set SD_DAT2__SLW, CYREG_PRT3_SLW /* SD_MISO */ +.set SD_MISO__0__INTTYPE, CYREG_PICU3_INTTYPE1 .set SD_MISO__0__MASK, 0x02 .set SD_MISO__0__PC, CYREG_PRT3_PC1 .set SD_MISO__0__PORT, 3 @@ -1269,6 +1312,7 @@ .set SD_MISO__DM2, CYREG_PRT3_DM2 .set SD_MISO__DR, CYREG_PRT3_DR .set SD_MISO__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_MISO__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_MISO__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_MISO__LCD_EN, CYREG_PRT3_LCD_EN .set SD_MISO__MASK, 0x02 @@ -1286,6 +1330,7 @@ .set SD_MISO__SLW, CYREG_PRT3_SLW /* SD_MOSI */ +.set SD_MOSI__0__INTTYPE, CYREG_PICU3_INTTYPE3 .set SD_MOSI__0__MASK, 0x08 .set SD_MOSI__0__PC, CYREG_PRT3_PC3 .set SD_MOSI__0__PORT, 3 @@ -1301,6 +1346,7 @@ .set SD_MOSI__DM2, CYREG_PRT3_DM2 .set SD_MOSI__DR, CYREG_PRT3_DR .set SD_MOSI__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_MOSI__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_MOSI__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_MOSI__LCD_EN, CYREG_PRT3_LCD_EN .set SD_MOSI__MASK, 0x08 @@ -1340,6 +1386,7 @@ .set SCSI_Out__0__DM2, CYREG_PRT4_DM2 .set SCSI_Out__0__DR, CYREG_PRT4_DR .set SCSI_Out__0__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__0__INTTYPE, CYREG_PICU4_INTTYPE3 .set SCSI_Out__0__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__0__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__0__MASK, 0x08 @@ -1367,6 +1414,7 @@ .set SCSI_Out__1__DM2, CYREG_PRT4_DM2 .set SCSI_Out__1__DR, CYREG_PRT4_DR .set SCSI_Out__1__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__1__INTTYPE, CYREG_PICU4_INTTYPE2 .set SCSI_Out__1__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__1__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__1__MASK, 0x04 @@ -1394,6 +1442,7 @@ .set SCSI_Out__2__DM2, CYREG_PRT0_DM2 .set SCSI_Out__2__DR, CYREG_PRT0_DR .set SCSI_Out__2__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__2__INTTYPE, CYREG_PICU0_INTTYPE7 .set SCSI_Out__2__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__2__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__2__MASK, 0x80 @@ -1421,6 +1470,7 @@ .set SCSI_Out__3__DM2, CYREG_PRT0_DM2 .set SCSI_Out__3__DR, CYREG_PRT0_DR .set SCSI_Out__3__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__3__INTTYPE, CYREG_PICU0_INTTYPE6 .set SCSI_Out__3__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__3__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__3__MASK, 0x40 @@ -1448,6 +1498,7 @@ .set SCSI_Out__4__DM2, CYREG_PRT0_DM2 .set SCSI_Out__4__DR, CYREG_PRT0_DR .set SCSI_Out__4__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__4__INTTYPE, CYREG_PICU0_INTTYPE5 .set SCSI_Out__4__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__4__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__4__MASK, 0x20 @@ -1475,6 +1526,7 @@ .set SCSI_Out__5__DM2, CYREG_PRT0_DM2 .set SCSI_Out__5__DR, CYREG_PRT0_DR .set SCSI_Out__5__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__5__INTTYPE, CYREG_PICU0_INTTYPE4 .set SCSI_Out__5__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__5__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__5__MASK, 0x10 @@ -1502,6 +1554,7 @@ .set SCSI_Out__6__DM2, CYREG_PRT0_DM2 .set SCSI_Out__6__DR, CYREG_PRT0_DR .set SCSI_Out__6__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__6__INTTYPE, CYREG_PICU0_INTTYPE3 .set SCSI_Out__6__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__6__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__6__MASK, 0x08 @@ -1529,6 +1582,7 @@ .set SCSI_Out__7__DM2, CYREG_PRT0_DM2 .set SCSI_Out__7__DR, CYREG_PRT0_DR .set SCSI_Out__7__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__7__INTTYPE, CYREG_PICU0_INTTYPE2 .set SCSI_Out__7__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__7__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__7__MASK, 0x04 @@ -1556,6 +1610,7 @@ .set SCSI_Out__8__DM2, CYREG_PRT0_DM2 .set SCSI_Out__8__DR, CYREG_PRT0_DR .set SCSI_Out__8__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__8__INTTYPE, CYREG_PICU0_INTTYPE1 .set SCSI_Out__8__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__8__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__8__MASK, 0x02 @@ -1583,6 +1638,7 @@ .set SCSI_Out__9__DM2, CYREG_PRT0_DM2 .set SCSI_Out__9__DR, CYREG_PRT0_DR .set SCSI_Out__9__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__9__INTTYPE, CYREG_PICU0_INTTYPE0 .set SCSI_Out__9__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__9__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__9__MASK, 0x01 @@ -1610,6 +1666,7 @@ .set SCSI_Out__ACK__DM2, CYREG_PRT0_DM2 .set SCSI_Out__ACK__DR, CYREG_PRT0_DR .set SCSI_Out__ACK__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__ACK__INTTYPE, CYREG_PICU0_INTTYPE6 .set SCSI_Out__ACK__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__ACK__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__ACK__MASK, 0x40 @@ -1637,6 +1694,7 @@ .set SCSI_Out__ATN__DM2, CYREG_PRT4_DM2 .set SCSI_Out__ATN__DR, CYREG_PRT4_DR .set SCSI_Out__ATN__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__ATN__INTTYPE, CYREG_PICU4_INTTYPE2 .set SCSI_Out__ATN__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__ATN__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__ATN__MASK, 0x04 @@ -1664,6 +1722,7 @@ .set SCSI_Out__BSY__DM2, CYREG_PRT0_DM2 .set SCSI_Out__BSY__DR, CYREG_PRT0_DR .set SCSI_Out__BSY__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__BSY__INTTYPE, CYREG_PICU0_INTTYPE7 .set SCSI_Out__BSY__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__BSY__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__BSY__MASK, 0x80 @@ -1691,6 +1750,7 @@ .set SCSI_Out__CD_raw__DM2, CYREG_PRT0_DM2 .set SCSI_Out__CD_raw__DR, CYREG_PRT0_DR .set SCSI_Out__CD_raw__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__CD_raw__INTTYPE, CYREG_PICU0_INTTYPE2 .set SCSI_Out__CD_raw__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__CD_raw__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__CD_raw__MASK, 0x04 @@ -1718,6 +1778,7 @@ .set SCSI_Out__DBP_raw__DM2, CYREG_PRT4_DM2 .set SCSI_Out__DBP_raw__DR, CYREG_PRT4_DR .set SCSI_Out__DBP_raw__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__DBP_raw__INTTYPE, CYREG_PICU4_INTTYPE3 .set SCSI_Out__DBP_raw__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__DBP_raw__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__DBP_raw__MASK, 0x08 @@ -1745,6 +1806,7 @@ .set SCSI_Out__IO_raw__DM2, CYREG_PRT0_DM2 .set SCSI_Out__IO_raw__DR, CYREG_PRT0_DR .set SCSI_Out__IO_raw__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__IO_raw__INTTYPE, CYREG_PICU0_INTTYPE0 .set SCSI_Out__IO_raw__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__IO_raw__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__IO_raw__MASK, 0x01 @@ -1772,6 +1834,7 @@ .set SCSI_Out__MSG_raw__DM2, CYREG_PRT0_DM2 .set SCSI_Out__MSG_raw__DR, CYREG_PRT0_DR .set SCSI_Out__MSG_raw__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__MSG_raw__INTTYPE, CYREG_PICU0_INTTYPE4 .set SCSI_Out__MSG_raw__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__MSG_raw__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__MSG_raw__MASK, 0x10 @@ -1799,6 +1862,7 @@ .set SCSI_Out__REQ__DM2, CYREG_PRT0_DM2 .set SCSI_Out__REQ__DR, CYREG_PRT0_DR .set SCSI_Out__REQ__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__REQ__INTTYPE, CYREG_PICU0_INTTYPE1 .set SCSI_Out__REQ__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__REQ__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__REQ__MASK, 0x02 @@ -1826,6 +1890,7 @@ .set SCSI_Out__RST__DM2, CYREG_PRT0_DM2 .set SCSI_Out__RST__DR, CYREG_PRT0_DR .set SCSI_Out__RST__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__RST__INTTYPE, CYREG_PICU0_INTTYPE5 .set SCSI_Out__RST__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__RST__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__RST__MASK, 0x20 @@ -1853,6 +1918,7 @@ .set SCSI_Out__SEL__DM2, CYREG_PRT0_DM2 .set SCSI_Out__SEL__DR, CYREG_PRT0_DR .set SCSI_Out__SEL__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__SEL__INTTYPE, CYREG_PICU0_INTTYPE3 .set SCSI_Out__SEL__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__SEL__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__SEL__MASK, 0x08 @@ -1875,15 +1941,15 @@ .set SCSI_Out_Bits_Sync_ctrl_reg__0__POS, 0 .set SCSI_Out_Bits_Sync_ctrl_reg__1__MASK, 0x02 .set SCSI_Out_Bits_Sync_ctrl_reg__1__POS, 1 -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB11_12_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB11_12_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB11_12_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB11_12_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB11_12_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB11_12_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB11_12_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB11_12_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB11_12_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B1_UDB05_06_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B1_UDB05_06_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B1_UDB05_06_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B1_UDB05_06_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B1_UDB05_06_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B1_UDB05_06_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B1_UDB05_06_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B1_UDB05_06_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B1_UDB05_06_MSK .set SCSI_Out_Bits_Sync_ctrl_reg__2__MASK, 0x04 .set SCSI_Out_Bits_Sync_ctrl_reg__2__POS, 2 .set SCSI_Out_Bits_Sync_ctrl_reg__3__MASK, 0x08 @@ -1896,28 +1962,37 @@ .set SCSI_Out_Bits_Sync_ctrl_reg__6__POS, 6 .set SCSI_Out_Bits_Sync_ctrl_reg__7__MASK, 0x80 .set SCSI_Out_Bits_Sync_ctrl_reg__7__POS, 7 -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB11_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB11_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB11_ST_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB11_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB11_ST_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B1_UDB05_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG, CYREG_B1_UDB05_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B1_UDB05_ST_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG, CYREG_B1_UDB05_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B1_UDB05_ST_CTL .set SCSI_Out_Bits_Sync_ctrl_reg__MASK, 0xFF -.set SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB11_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B1_UDB05_MSK_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG, CYREG_B1_UDB05_MSK /* SCSI_Out_Ctl */ .set SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_Out_Ctl_Sync_ctrl_reg__0__POS, 0 -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB15_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB15_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB15_ST_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB15_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB15_ST_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB05_06_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB05_06_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB05_06_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB05_06_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB05_06_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB05_06_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB05_06_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB05_06_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB05_06_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB05_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB05_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB05_ST_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB05_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB05_ST_CTL .set SCSI_Out_Ctl_Sync_ctrl_reg__MASK, 0x01 -.set SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB15_MSK_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB15_MSK_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB15_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB05_MSK_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB05_MSK_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB05_MSK /* SCSI_Out_DBx */ .set SCSI_Out_DBx__0__AG, CYREG_PRT6_AG @@ -1931,6 +2006,7 @@ .set SCSI_Out_DBx__0__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__0__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__0__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__0__INTTYPE, CYREG_PICU6_INTTYPE3 .set SCSI_Out_DBx__0__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__0__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__0__MASK, 0x08 @@ -1958,6 +2034,7 @@ .set SCSI_Out_DBx__1__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__1__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__1__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__1__INTTYPE, CYREG_PICU6_INTTYPE2 .set SCSI_Out_DBx__1__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__1__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__1__MASK, 0x04 @@ -1985,6 +2062,7 @@ .set SCSI_Out_DBx__2__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__2__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__2__INTTYPE, CYREG_PICU6_INTTYPE1 .set SCSI_Out_DBx__2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__2__MASK, 0x02 @@ -2012,6 +2090,7 @@ .set SCSI_Out_DBx__3__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__3__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__3__INTTYPE, CYREG_PICU6_INTTYPE0 .set SCSI_Out_DBx__3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__3__MASK, 0x01 @@ -2039,6 +2118,7 @@ .set SCSI_Out_DBx__4__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__4__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__4__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__4__INTTYPE, CYREG_PICU4_INTTYPE7 .set SCSI_Out_DBx__4__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__4__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__4__MASK, 0x80 @@ -2066,6 +2146,7 @@ .set SCSI_Out_DBx__5__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__5__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__5__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__5__INTTYPE, CYREG_PICU4_INTTYPE6 .set SCSI_Out_DBx__5__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__5__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__5__MASK, 0x40 @@ -2093,6 +2174,7 @@ .set SCSI_Out_DBx__6__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__6__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__6__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__6__INTTYPE, CYREG_PICU4_INTTYPE5 .set SCSI_Out_DBx__6__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__6__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__6__MASK, 0x20 @@ -2120,6 +2202,7 @@ .set SCSI_Out_DBx__7__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__7__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__7__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__7__INTTYPE, CYREG_PICU4_INTTYPE4 .set SCSI_Out_DBx__7__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__7__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__7__MASK, 0x10 @@ -2147,6 +2230,7 @@ .set SCSI_Out_DBx__DB0__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB0__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB0__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB0__INTTYPE, CYREG_PICU6_INTTYPE3 .set SCSI_Out_DBx__DB0__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB0__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB0__MASK, 0x08 @@ -2174,6 +2258,7 @@ .set SCSI_Out_DBx__DB1__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB1__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB1__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB1__INTTYPE, CYREG_PICU6_INTTYPE2 .set SCSI_Out_DBx__DB1__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB1__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB1__MASK, 0x04 @@ -2201,6 +2286,7 @@ .set SCSI_Out_DBx__DB2__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB2__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB2__INTTYPE, CYREG_PICU6_INTTYPE1 .set SCSI_Out_DBx__DB2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB2__MASK, 0x02 @@ -2228,6 +2314,7 @@ .set SCSI_Out_DBx__DB3__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB3__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB3__INTTYPE, CYREG_PICU6_INTTYPE0 .set SCSI_Out_DBx__DB3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB3__MASK, 0x01 @@ -2255,6 +2342,7 @@ .set SCSI_Out_DBx__DB4__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__DB4__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__DB4__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__DB4__INTTYPE, CYREG_PICU4_INTTYPE7 .set SCSI_Out_DBx__DB4__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__DB4__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__DB4__MASK, 0x80 @@ -2282,6 +2370,7 @@ .set SCSI_Out_DBx__DB5__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__DB5__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__DB5__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__DB5__INTTYPE, CYREG_PICU4_INTTYPE6 .set SCSI_Out_DBx__DB5__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__DB5__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__DB5__MASK, 0x40 @@ -2309,6 +2398,7 @@ .set SCSI_Out_DBx__DB6__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__DB6__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__DB6__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__DB6__INTTYPE, CYREG_PICU4_INTTYPE5 .set SCSI_Out_DBx__DB6__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__DB6__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__DB6__MASK, 0x20 @@ -2336,6 +2426,7 @@ .set SCSI_Out_DBx__DB7__DM2, CYREG_PRT4_DM2 .set SCSI_Out_DBx__DB7__DR, CYREG_PRT4_DR .set SCSI_Out_DBx__DB7__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out_DBx__DB7__INTTYPE, CYREG_PICU4_INTTYPE4 .set SCSI_Out_DBx__DB7__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out_DBx__DB7__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out_DBx__DB7__MASK, 0x10 @@ -2407,6 +2498,7 @@ .set SCSI_Noise__0__DM2, CYREG_PRT12_DM2 .set SCSI_Noise__0__DR, CYREG_PRT12_DR .set SCSI_Noise__0__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_Noise__0__INTTYPE, CYREG_PICU12_INTTYPE5 .set SCSI_Noise__0__MASK, 0x20 .set SCSI_Noise__0__PC, CYREG_PRT12_PC5 .set SCSI_Noise__0__PORT, 12 @@ -2435,6 +2527,7 @@ .set SCSI_Noise__1__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__1__DR, CYREG_PRT6_DR .set SCSI_Noise__1__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__1__INTTYPE, CYREG_PICU6_INTTYPE4 .set SCSI_Noise__1__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__1__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__1__MASK, 0x10 @@ -2462,6 +2555,7 @@ .set SCSI_Noise__2__DM2, CYREG_PRT5_DM2 .set SCSI_Noise__2__DR, CYREG_PRT5_DR .set SCSI_Noise__2__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Noise__2__INTTYPE, CYREG_PICU5_INTTYPE0 .set SCSI_Noise__2__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Noise__2__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Noise__2__MASK, 0x01 @@ -2489,6 +2583,7 @@ .set SCSI_Noise__3__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__3__DR, CYREG_PRT6_DR .set SCSI_Noise__3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__3__INTTYPE, CYREG_PICU6_INTTYPE6 .set SCSI_Noise__3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__3__MASK, 0x40 @@ -2516,6 +2611,7 @@ .set SCSI_Noise__4__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__4__DR, CYREG_PRT6_DR .set SCSI_Noise__4__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__4__INTTYPE, CYREG_PICU6_INTTYPE5 .set SCSI_Noise__4__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__4__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__4__MASK, 0x20 @@ -2543,6 +2639,7 @@ .set SCSI_Noise__ACK__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__ACK__DR, CYREG_PRT6_DR .set SCSI_Noise__ACK__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__ACK__INTTYPE, CYREG_PICU6_INTTYPE5 .set SCSI_Noise__ACK__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__ACK__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__ACK__MASK, 0x20 @@ -2568,6 +2665,7 @@ .set SCSI_Noise__ATN__DM2, CYREG_PRT12_DM2 .set SCSI_Noise__ATN__DR, CYREG_PRT12_DR .set SCSI_Noise__ATN__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_Noise__ATN__INTTYPE, CYREG_PICU12_INTTYPE5 .set SCSI_Noise__ATN__MASK, 0x20 .set SCSI_Noise__ATN__PC, CYREG_PRT12_PC5 .set SCSI_Noise__ATN__PORT, 12 @@ -2596,6 +2694,7 @@ .set SCSI_Noise__BSY__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__BSY__DR, CYREG_PRT6_DR .set SCSI_Noise__BSY__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__BSY__INTTYPE, CYREG_PICU6_INTTYPE4 .set SCSI_Noise__BSY__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__BSY__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__BSY__MASK, 0x10 @@ -2623,6 +2722,7 @@ .set SCSI_Noise__RST__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__RST__DR, CYREG_PRT6_DR .set SCSI_Noise__RST__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__RST__INTTYPE, CYREG_PICU6_INTTYPE6 .set SCSI_Noise__RST__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__RST__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__RST__MASK, 0x40 @@ -2650,6 +2750,7 @@ .set SCSI_Noise__SEL__DM2, CYREG_PRT5_DM2 .set SCSI_Noise__SEL__DR, CYREG_PRT5_DR .set SCSI_Noise__SEL__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Noise__SEL__INTTYPE, CYREG_PICU5_INTTYPE0 .set SCSI_Noise__SEL__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Noise__SEL__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Noise__SEL__MASK, 0x01 @@ -2727,11 +2828,7 @@ .set scsiTarget_StatusReg__4__POS, 4 .set scsiTarget_StatusReg__MASK, 0x1F .set scsiTarget_StatusReg__MASK_REG, CYREG_B0_UDB02_MSK -.set scsiTarget_StatusReg__MASK_ST_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL -.set scsiTarget_StatusReg__PER_ST_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL .set scsiTarget_StatusReg__STATUS_AUX_CTL_REG, CYREG_B0_UDB02_ACTL -.set scsiTarget_StatusReg__STATUS_CNT_REG, CYREG_B0_UDB02_ST_CTL -.set scsiTarget_StatusReg__STATUS_CONTROL_REG, CYREG_B0_UDB02_ST_CTL .set scsiTarget_StatusReg__STATUS_REG, CYREG_B0_UDB02_ST /* Debug_Timer_Interrupt */ @@ -2853,8 +2950,8 @@ .set SCSI_Filtered_sts_sts_reg__0__POS, 0 .set SCSI_Filtered_sts_sts_reg__1__MASK, 0x02 .set SCSI_Filtered_sts_sts_reg__1__POS, 1 -.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB10_11_ACTL -.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB10_11_ST +.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB01_02_ACTL +.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB01_02_ST .set SCSI_Filtered_sts_sts_reg__2__MASK, 0x04 .set SCSI_Filtered_sts_sts_reg__2__POS, 2 .set SCSI_Filtered_sts_sts_reg__3__MASK, 0x08 @@ -2862,81 +2959,77 @@ .set SCSI_Filtered_sts_sts_reg__4__MASK, 0x10 .set SCSI_Filtered_sts_sts_reg__4__POS, 4 .set SCSI_Filtered_sts_sts_reg__MASK, 0x1F -.set SCSI_Filtered_sts_sts_reg__MASK_REG, CYREG_B0_UDB10_MSK -.set SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB10_ACTL -.set SCSI_Filtered_sts_sts_reg__STATUS_REG, CYREG_B0_UDB10_ST +.set SCSI_Filtered_sts_sts_reg__MASK_REG, CYREG_B0_UDB01_MSK +.set SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB01_ACTL +.set SCSI_Filtered_sts_sts_reg__STATUS_REG, CYREG_B0_UDB01_ST /* SCSI_CTL_PHASE */ .set SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS, 0 .set SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK, 0x02 .set SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS, 1 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB02_03_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB02_03_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB02_03_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB02_03_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB02_03_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB02_03_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB02_03_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB02_03_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB02_03_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB11_12_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB11_12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB11_12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB11_12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB11_12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB11_12_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB11_12_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB11_12_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB11_12_MSK .set SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK, 0x04 .set SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS, 2 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB02_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB02_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB02_ST_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB02_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB02_ST_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB11_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB11_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB11_ST_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB11_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB11_ST_CTL .set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK, 0x07 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB02_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB11_MSK /* SCSI_Glitch_Ctl */ .set SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS, 0 -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB04_05_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB04_05_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB04_05_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB04_05_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB04_05_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB04_05_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB04_05_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB04_05_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB04_05_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB04_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB04_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB04_ST_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB04_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB04_ST_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB10_11_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB10_11_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB10_11_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB10_11_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB10_11_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB10_11_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB10_11_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB10_11_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB10_11_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB10_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB10_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB10_ST_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB10_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB10_ST_CTL .set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK, 0x01 -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB04_MSK_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB04_MSK_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB04_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB10_MSK_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB10_MSK_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB10_MSK /* SCSI_Parity_Error */ .set SCSI_Parity_Error_sts_sts_reg__0__MASK, 0x01 .set SCSI_Parity_Error_sts_sts_reg__0__POS, 0 -.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB11_12_ACTL -.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB11_12_ST +.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB04_05_ACTL +.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB04_05_ST .set SCSI_Parity_Error_sts_sts_reg__MASK, 0x01 -.set SCSI_Parity_Error_sts_sts_reg__MASK_REG, CYREG_B0_UDB11_MSK -.set SCSI_Parity_Error_sts_sts_reg__MASK_ST_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL -.set SCSI_Parity_Error_sts_sts_reg__PER_ST_AUX_CTL_REG, CYREG_B0_UDB11_MSK_ACTL -.set SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB11_ACTL -.set SCSI_Parity_Error_sts_sts_reg__STATUS_CNT_REG, CYREG_B0_UDB11_ST_CTL -.set SCSI_Parity_Error_sts_sts_reg__STATUS_CONTROL_REG, CYREG_B0_UDB11_ST_CTL -.set SCSI_Parity_Error_sts_sts_reg__STATUS_REG, CYREG_B0_UDB11_ST +.set SCSI_Parity_Error_sts_sts_reg__MASK_REG, CYREG_B0_UDB04_MSK +.set SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB04_ACTL +.set SCSI_Parity_Error_sts_sts_reg__STATUS_REG, CYREG_B0_UDB04_ST /* Miscellaneous */ .set BCLK__BUS_CLK__HZ, 50000000 .set BCLK__BUS_CLK__KHZ, 50000 .set BCLK__BUS_CLK__MHZ, 50 -.set CYDEV_CHIP_DIE_GEN4, 2 .set CYDEV_CHIP_DIE_LEOPARD, 1 -.set CYDEV_CHIP_DIE_PANTHER, 12 -.set CYDEV_CHIP_DIE_PSOC4A, 5 -.set CYDEV_CHIP_DIE_PSOC5LP, 11 +.set CYDEV_CHIP_DIE_PANTHER, 18 +.set CYDEV_CHIP_DIE_PSOC4A, 10 +.set CYDEV_CHIP_DIE_PSOC5LP, 17 +.set CYDEV_CHIP_DIE_TMA4, 2 .set CYDEV_CHIP_DIE_UNKNOWN, 0 .set CYDEV_CHIP_FAMILY_PSOC3, 1 .set CYDEV_CHIP_FAMILY_PSOC4, 2 @@ -2945,23 +3038,26 @@ .set CYDEV_CHIP_FAMILY_USED, CYDEV_CHIP_FAMILY_PSOC5 .set CYDEV_CHIP_JTAG_ID, 0x2E133069 .set CYDEV_CHIP_MEMBER_3A, 1 -.set CYDEV_CHIP_MEMBER_4A, 5 -.set CYDEV_CHIP_MEMBER_4C, 9 -.set CYDEV_CHIP_MEMBER_4D, 3 +.set CYDEV_CHIP_MEMBER_4A, 10 +.set CYDEV_CHIP_MEMBER_4C, 15 +.set CYDEV_CHIP_MEMBER_4D, 6 .set CYDEV_CHIP_MEMBER_4E, 4 -.set CYDEV_CHIP_MEMBER_4F, 6 +.set CYDEV_CHIP_MEMBER_4F, 11 .set CYDEV_CHIP_MEMBER_4G, 2 -.set CYDEV_CHIP_MEMBER_4L, 8 -.set CYDEV_CHIP_MEMBER_4M, 7 -.set CYDEV_CHIP_MEMBER_5A, 11 -.set CYDEV_CHIP_MEMBER_5B, 10 +.set CYDEV_CHIP_MEMBER_4H, 9 +.set CYDEV_CHIP_MEMBER_4I, 14 +.set CYDEV_CHIP_MEMBER_4J, 7 +.set CYDEV_CHIP_MEMBER_4K, 8 +.set CYDEV_CHIP_MEMBER_4L, 13 +.set CYDEV_CHIP_MEMBER_4M, 12 +.set CYDEV_CHIP_MEMBER_4N, 5 +.set CYDEV_CHIP_MEMBER_4U, 3 +.set CYDEV_CHIP_MEMBER_5A, 17 +.set CYDEV_CHIP_MEMBER_5B, 16 .set CYDEV_CHIP_MEMBER_UNKNOWN, 0 .set CYDEV_CHIP_MEMBER_USED, CYDEV_CHIP_MEMBER_5B .set CYDEV_CHIP_DIE_EXPECT, CYDEV_CHIP_MEMBER_USED .set CYDEV_CHIP_DIE_ACTUAL, CYDEV_CHIP_DIE_EXPECT -.set CYDEV_CHIP_REV_GEN4_ES, 17 -.set CYDEV_CHIP_REV_GEN4_ES2, 33 -.set CYDEV_CHIP_REV_GEN4_PRODUCTION, 17 .set CYDEV_CHIP_REV_LEOPARD_ES1, 0 .set CYDEV_CHIP_REV_LEOPARD_ES2, 1 .set CYDEV_CHIP_REV_LEOPARD_ES3, 3 @@ -2973,6 +3069,9 @@ .set CYDEV_CHIP_REV_PSOC4A_PRODUCTION, 17 .set CYDEV_CHIP_REV_PSOC5LP_ES0, 0 .set CYDEV_CHIP_REV_PSOC5LP_PRODUCTION, 0 +.set CYDEV_CHIP_REV_TMA4_ES, 17 +.set CYDEV_CHIP_REV_TMA4_ES2, 33 +.set CYDEV_CHIP_REV_TMA4_PRODUCTION, 17 .set CYDEV_CHIP_REVISION_3A_ES1, 0 .set CYDEV_CHIP_REVISION_3A_ES2, 1 .set CYDEV_CHIP_REVISION_3A_ES3, 3 @@ -2983,12 +3082,19 @@ .set CYDEV_CHIP_REVISION_4D_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4E_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4F_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA, 0 .set CYDEV_CHIP_REVISION_4F_PRODUCTION_256K, 0 .set CYDEV_CHIP_REVISION_4G_ES, 17 .set CYDEV_CHIP_REVISION_4G_ES2, 33 .set CYDEV_CHIP_REVISION_4G_PRODUCTION, 17 +.set CYDEV_CHIP_REVISION_4H_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4I_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4J_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4K_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4L_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4M_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4N_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4U_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_5A_ES0, 0 .set CYDEV_CHIP_REVISION_5A_ES1, 1 .set CYDEV_CHIP_REVISION_5A_PRODUCTION, 1 @@ -3021,6 +3127,8 @@ .set CYDEV_HEAP_SIZE, 0x0400 .set CYDEV_INSTRUCT_CACHE_ENABLED, 1 .set CYDEV_INTR_RISING, 0x0000007E +.set CYDEV_IS_EXPORTING_CODE, 0 +.set CYDEV_IS_IMPORTING_CODE, 0 .set CYDEV_PROJ_TYPE, 2 .set CYDEV_PROJ_TYPE_BOOTLOADER, 1 .set CYDEV_PROJ_TYPE_LAUNCHER, 5 diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc index 5e58744c..b5e792bf 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc @@ -4,6 +4,7 @@ INCLUDE cydeviceiar_trm.inc /* LED1 */ +LED1__0__INTTYPE EQU CYREG_PICU12_INTTYPE3 LED1__0__MASK EQU 0x08 LED1__0__PC EQU CYREG_PRT12_PC3 LED1__0__PORT EQU 12 @@ -17,6 +18,7 @@ LED1__DM1 EQU CYREG_PRT12_DM1 LED1__DM2 EQU CYREG_PRT12_DM2 LED1__DR EQU CYREG_PRT12_DR LED1__INP_DIS EQU CYREG_PRT12_INP_DIS +LED1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU12_BASE LED1__MASK EQU 0x08 LED1__PORT EQU 12 LED1__PRT EQU CYREG_PRT12_PRT @@ -35,6 +37,7 @@ LED1__SIO_REG_HIFREQ EQU CYREG_PRT12_SIO_REG_HIFREQ LED1__SLW EQU CYREG_PRT12_SLW /* SD_CD */ +SD_CD__0__INTTYPE EQU CYREG_PICU3_INTTYPE6 SD_CD__0__MASK EQU 0x40 SD_CD__0__PC EQU CYREG_PRT3_PC6 SD_CD__0__PORT EQU 3 @@ -50,6 +53,7 @@ SD_CD__DM1 EQU CYREG_PRT3_DM1 SD_CD__DM2 EQU CYREG_PRT3_DM2 SD_CD__DR EQU CYREG_PRT3_DR SD_CD__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CD__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CD__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CD__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CD__MASK EQU 0x40 @@ -67,6 +71,7 @@ SD_CD__SHIFT EQU 6 SD_CD__SLW EQU CYREG_PRT3_SLW /* SD_CS */ +SD_CS__0__INTTYPE EQU CYREG_PICU3_INTTYPE4 SD_CS__0__MASK EQU 0x10 SD_CS__0__PC EQU CYREG_PRT3_PC4 SD_CS__0__PORT EQU 3 @@ -82,6 +87,7 @@ SD_CS__DM1 EQU CYREG_PRT3_DM1 SD_CS__DM2 EQU CYREG_PRT3_DM2 SD_CS__DR EQU CYREG_PRT3_DR SD_CS__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CS__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CS__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CS__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CS__MASK EQU 0x10 @@ -119,6 +125,7 @@ USBFS_bus_reset__INTC_SET_EN_REG EQU CYREG_NVIC_SETENA0 USBFS_bus_reset__INTC_SET_PD_REG EQU CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +USBFS_Dm__0__INTTYPE EQU CYREG_PICU15_INTTYPE7 USBFS_Dm__0__MASK EQU 0x80 USBFS_Dm__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC1 USBFS_Dm__0__PORT EQU 15 @@ -134,6 +141,7 @@ USBFS_Dm__DM1 EQU CYREG_PRT15_DM1 USBFS_Dm__DM2 EQU CYREG_PRT15_DM2 USBFS_Dm__DR EQU CYREG_PRT15_DR USBFS_Dm__INP_DIS EQU CYREG_PRT15_INP_DIS +USBFS_Dm__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dm__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dm__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dm__MASK EQU 0x80 @@ -151,6 +159,7 @@ USBFS_Dm__SHIFT EQU 7 USBFS_Dm__SLW EQU CYREG_PRT15_SLW /* USBFS_Dp */ +USBFS_Dp__0__INTTYPE EQU CYREG_PICU15_INTTYPE6 USBFS_Dp__0__MASK EQU 0x40 USBFS_Dp__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC0 USBFS_Dp__0__PORT EQU 15 @@ -167,6 +176,7 @@ USBFS_Dp__DM2 EQU CYREG_PRT15_DM2 USBFS_Dp__DR EQU CYREG_PRT15_DR USBFS_Dp__INP_DIS EQU CYREG_PRT15_INP_DIS USBFS_Dp__INTSTAT EQU CYREG_PICU15_INTSTAT +USBFS_Dp__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dp__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dp__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dp__MASK EQU 0x40 @@ -381,34 +391,34 @@ USBFS_USB__USBIO_CR0 EQU CYREG_USB_USBIO_CR0 USBFS_USB__USBIO_CR1 EQU CYREG_USB_USBIO_CR1 /* SDCard_BSPIM */ -SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL -SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B1_UDB05_CTL -SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B1_UDB05_CTL -SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B1_UDB05_MSK -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B1_UDB05_06_ST -SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B1_UDB05_MSK -SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B1_UDB05_ST -SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL -SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB06_07_ST +SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B0_UDB07_CTL +SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B0_UDB07_CTL +SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST +SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B0_UDB07_ST +SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB08_09_ACTL +SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB08_09_ST SDCard_BSPIM_RxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_RxStsReg__4__POS EQU 4 SDCard_BSPIM_RxStsReg__5__MASK EQU 0x20 @@ -416,9 +426,9 @@ SDCard_BSPIM_RxStsReg__5__POS EQU 5 SDCard_BSPIM_RxStsReg__6__MASK EQU 0x40 SDCard_BSPIM_RxStsReg__6__POS EQU 6 SDCard_BSPIM_RxStsReg__MASK EQU 0x70 -SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB06_MSK -SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL -SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB06_ST +SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB08_MSK +SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB08_ACTL +SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB08_ST SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG EQU CYREG_B1_UDB04_05_A0 SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG EQU CYREG_B1_UDB04_05_A1 SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG EQU CYREG_B1_UDB04_05_D0 @@ -454,6 +464,7 @@ SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B1_UDB07_ST /* SD_SCK */ +SD_SCK__0__INTTYPE EQU CYREG_PICU3_INTTYPE2 SD_SCK__0__MASK EQU 0x04 SD_SCK__0__PC EQU CYREG_PRT3_PC2 SD_SCK__0__PORT EQU 3 @@ -469,6 +480,7 @@ SD_SCK__DM1 EQU CYREG_PRT3_DM1 SD_SCK__DM2 EQU CYREG_PRT3_DM2 SD_SCK__DR EQU CYREG_PRT3_DR SD_SCK__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_SCK__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_SCK__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_SCK__LCD_EN EQU CYREG_PRT3_LCD_EN SD_SCK__MASK EQU 0x04 @@ -497,6 +509,7 @@ SCSI_In__0__DM1 EQU CYREG_PRT2_DM1 SCSI_In__0__DM2 EQU CYREG_PRT2_DM2 SCSI_In__0__DR EQU CYREG_PRT2_DR SCSI_In__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__0__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_In__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__0__MASK EQU 0x01 @@ -524,6 +537,7 @@ SCSI_In__1__DM1 EQU CYREG_PRT6_DM1 SCSI_In__1__DM2 EQU CYREG_PRT6_DM2 SCSI_In__1__DR EQU CYREG_PRT6_DR SCSI_In__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In__1__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In__1__MASK EQU 0x80 @@ -551,6 +565,7 @@ SCSI_In__2__DM1 EQU CYREG_PRT5_DM1 SCSI_In__2__DM2 EQU CYREG_PRT5_DM2 SCSI_In__2__DR EQU CYREG_PRT5_DR SCSI_In__2__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__2__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_In__2__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__2__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__2__MASK EQU 0x02 @@ -578,6 +593,7 @@ SCSI_In__3__DM1 EQU CYREG_PRT5_DM1 SCSI_In__3__DM2 EQU CYREG_PRT5_DM2 SCSI_In__3__DR EQU CYREG_PRT5_DR SCSI_In__3__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__3__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In__3__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__3__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__3__MASK EQU 0x04 @@ -605,6 +621,7 @@ SCSI_In__4__DM1 EQU CYREG_PRT5_DM1 SCSI_In__4__DM2 EQU CYREG_PRT5_DM2 SCSI_In__4__DR EQU CYREG_PRT5_DR SCSI_In__4__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__4__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In__4__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__4__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__4__MASK EQU 0x08 @@ -632,6 +649,7 @@ SCSI_In__CD__DM1 EQU CYREG_PRT5_DM1 SCSI_In__CD__DM2 EQU CYREG_PRT5_DM2 SCSI_In__CD__DR EQU CYREG_PRT5_DR SCSI_In__CD__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__CD__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_In__CD__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__CD__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__CD__MASK EQU 0x02 @@ -659,6 +677,7 @@ SCSI_In__DBP__DM1 EQU CYREG_PRT2_DM1 SCSI_In__DBP__DM2 EQU CYREG_PRT2_DM2 SCSI_In__DBP__DR EQU CYREG_PRT2_DR SCSI_In__DBP__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__DBP__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_In__DBP__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__DBP__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__DBP__MASK EQU 0x01 @@ -686,6 +705,7 @@ SCSI_In__IO__DM1 EQU CYREG_PRT5_DM1 SCSI_In__IO__DM2 EQU CYREG_PRT5_DM2 SCSI_In__IO__DR EQU CYREG_PRT5_DR SCSI_In__IO__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__IO__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In__IO__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__IO__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__IO__MASK EQU 0x08 @@ -713,6 +733,7 @@ SCSI_In__MSG__DM1 EQU CYREG_PRT6_DM1 SCSI_In__MSG__DM2 EQU CYREG_PRT6_DM2 SCSI_In__MSG__DR EQU CYREG_PRT6_DR SCSI_In__MSG__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In__MSG__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In__MSG__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In__MSG__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In__MSG__MASK EQU 0x80 @@ -740,6 +761,7 @@ SCSI_In__REQ__DM1 EQU CYREG_PRT5_DM1 SCSI_In__REQ__DM2 EQU CYREG_PRT5_DM2 SCSI_In__REQ__DR EQU CYREG_PRT5_DR SCSI_In__REQ__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__REQ__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In__REQ__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__REQ__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__REQ__MASK EQU 0x04 @@ -767,6 +789,7 @@ SCSI_In_DBx__0__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__0__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__0__DR EQU CYREG_PRT12_DR SCSI_In_DBx__0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__0__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__0__MASK EQU 0x10 SCSI_In_DBx__0__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__0__PORT EQU 12 @@ -795,6 +818,7 @@ SCSI_In_DBx__1__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__1__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__1__DR EQU CYREG_PRT2_DR SCSI_In_DBx__1__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__1__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_In_DBx__1__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__1__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__1__MASK EQU 0x80 @@ -822,6 +846,7 @@ SCSI_In_DBx__2__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__2__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__2__DR EQU CYREG_PRT2_DR SCSI_In_DBx__2__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__2__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_In_DBx__2__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__2__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__2__MASK EQU 0x40 @@ -849,6 +874,7 @@ SCSI_In_DBx__3__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__3__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__3__DR EQU CYREG_PRT2_DR SCSI_In_DBx__3__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__3__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__3__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__3__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__3__MASK EQU 0x20 @@ -876,6 +902,7 @@ SCSI_In_DBx__4__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__4__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__4__DR EQU CYREG_PRT2_DR SCSI_In_DBx__4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__4__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__4__MASK EQU 0x10 @@ -903,6 +930,7 @@ SCSI_In_DBx__5__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__5__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__5__DR EQU CYREG_PRT2_DR SCSI_In_DBx__5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__5__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_In_DBx__5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__5__MASK EQU 0x08 @@ -930,6 +958,7 @@ SCSI_In_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_In_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__6__MASK EQU 0x04 @@ -957,6 +986,7 @@ SCSI_In_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__7__MASK EQU 0x02 @@ -982,6 +1012,7 @@ SCSI_In_DBx__DB0__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB0__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB0__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB0__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__DB0__MASK EQU 0x10 SCSI_In_DBx__DB0__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__DB0__PORT EQU 12 @@ -1010,6 +1041,7 @@ SCSI_In_DBx__DB1__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB1__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB1__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB1__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB1__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_In_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB1__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB1__MASK EQU 0x80 @@ -1037,6 +1069,7 @@ SCSI_In_DBx__DB2__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB2__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB2__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB2__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB2__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_In_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB2__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB2__MASK EQU 0x40 @@ -1064,6 +1097,7 @@ SCSI_In_DBx__DB3__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB3__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB3__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB3__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB3__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB3__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB3__MASK EQU 0x20 @@ -1091,6 +1125,7 @@ SCSI_In_DBx__DB4__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB4__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB4__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB4__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB4__MASK EQU 0x10 @@ -1118,6 +1153,7 @@ SCSI_In_DBx__DB5__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB5__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB5__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB5__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_In_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB5__MASK EQU 0x08 @@ -1145,6 +1181,7 @@ SCSI_In_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_In_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB6__MASK EQU 0x04 @@ -1172,6 +1209,7 @@ SCSI_In_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB7__MASK EQU 0x02 @@ -1190,6 +1228,7 @@ SCSI_In_DBx__DB7__SHIFT EQU 1 SCSI_In_DBx__DB7__SLW EQU CYREG_PRT2_SLW /* SD_DAT1 */ +SD_DAT1__0__INTTYPE EQU CYREG_PICU3_INTTYPE0 SD_DAT1__0__MASK EQU 0x01 SD_DAT1__0__PC EQU CYREG_PRT3_PC0 SD_DAT1__0__PORT EQU 3 @@ -1205,6 +1244,7 @@ SD_DAT1__DM1 EQU CYREG_PRT3_DM1 SD_DAT1__DM2 EQU CYREG_PRT3_DM2 SD_DAT1__DR EQU CYREG_PRT3_DR SD_DAT1__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_DAT1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_DAT1__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_DAT1__LCD_EN EQU CYREG_PRT3_LCD_EN SD_DAT1__MASK EQU 0x01 @@ -1222,6 +1262,7 @@ SD_DAT1__SHIFT EQU 0 SD_DAT1__SLW EQU CYREG_PRT3_SLW /* SD_DAT2 */ +SD_DAT2__0__INTTYPE EQU CYREG_PICU3_INTTYPE5 SD_DAT2__0__MASK EQU 0x20 SD_DAT2__0__PC EQU CYREG_PRT3_PC5 SD_DAT2__0__PORT EQU 3 @@ -1237,6 +1278,7 @@ SD_DAT2__DM1 EQU CYREG_PRT3_DM1 SD_DAT2__DM2 EQU CYREG_PRT3_DM2 SD_DAT2__DR EQU CYREG_PRT3_DR SD_DAT2__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_DAT2__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_DAT2__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_DAT2__LCD_EN EQU CYREG_PRT3_LCD_EN SD_DAT2__MASK EQU 0x20 @@ -1254,6 +1296,7 @@ SD_DAT2__SHIFT EQU 5 SD_DAT2__SLW EQU CYREG_PRT3_SLW /* SD_MISO */ +SD_MISO__0__INTTYPE EQU CYREG_PICU3_INTTYPE1 SD_MISO__0__MASK EQU 0x02 SD_MISO__0__PC EQU CYREG_PRT3_PC1 SD_MISO__0__PORT EQU 3 @@ -1269,6 +1312,7 @@ SD_MISO__DM1 EQU CYREG_PRT3_DM1 SD_MISO__DM2 EQU CYREG_PRT3_DM2 SD_MISO__DR EQU CYREG_PRT3_DR SD_MISO__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MISO__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MISO__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MISO__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MISO__MASK EQU 0x02 @@ -1286,6 +1330,7 @@ SD_MISO__SHIFT EQU 1 SD_MISO__SLW EQU CYREG_PRT3_SLW /* SD_MOSI */ +SD_MOSI__0__INTTYPE EQU CYREG_PICU3_INTTYPE3 SD_MOSI__0__MASK EQU 0x08 SD_MOSI__0__PC EQU CYREG_PRT3_PC3 SD_MOSI__0__PORT EQU 3 @@ -1301,6 +1346,7 @@ SD_MOSI__DM1 EQU CYREG_PRT3_DM1 SD_MOSI__DM2 EQU CYREG_PRT3_DM2 SD_MOSI__DR EQU CYREG_PRT3_DR SD_MOSI__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MOSI__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MOSI__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MOSI__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MOSI__MASK EQU 0x08 @@ -1340,6 +1386,7 @@ SCSI_Out__0__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__0__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__0__DR EQU CYREG_PRT4_DR SCSI_Out__0__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__0__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Out__0__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__0__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__0__MASK EQU 0x08 @@ -1367,6 +1414,7 @@ SCSI_Out__1__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__1__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__1__DR EQU CYREG_PRT4_DR SCSI_Out__1__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__1__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_Out__1__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__1__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__1__MASK EQU 0x04 @@ -1394,6 +1442,7 @@ SCSI_Out__2__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__2__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__2__DR EQU CYREG_PRT0_DR SCSI_Out__2__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__2__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__2__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__2__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__2__MASK EQU 0x80 @@ -1421,6 +1470,7 @@ SCSI_Out__3__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__3__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__3__DR EQU CYREG_PRT0_DR SCSI_Out__3__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__3__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__3__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__3__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__3__MASK EQU 0x40 @@ -1448,6 +1498,7 @@ SCSI_Out__4__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__4__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__4__DR EQU CYREG_PRT0_DR SCSI_Out__4__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__4__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_Out__4__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__4__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__4__MASK EQU 0x20 @@ -1475,6 +1526,7 @@ SCSI_Out__5__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__5__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__5__DR EQU CYREG_PRT0_DR SCSI_Out__5__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__5__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_Out__5__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__5__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__5__MASK EQU 0x10 @@ -1502,6 +1554,7 @@ SCSI_Out__6__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__6__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__6__DR EQU CYREG_PRT0_DR SCSI_Out__6__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__6__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__6__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__6__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__6__MASK EQU 0x08 @@ -1529,6 +1582,7 @@ SCSI_Out__7__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__7__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__7__DR EQU CYREG_PRT0_DR SCSI_Out__7__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__7__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__7__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__7__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__7__MASK EQU 0x04 @@ -1556,6 +1610,7 @@ SCSI_Out__8__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__8__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__8__DR EQU CYREG_PRT0_DR SCSI_Out__8__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__8__INTTYPE EQU CYREG_PICU0_INTTYPE1 SCSI_Out__8__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__8__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__8__MASK EQU 0x02 @@ -1583,6 +1638,7 @@ SCSI_Out__9__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__9__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__9__DR EQU CYREG_PRT0_DR SCSI_Out__9__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__9__INTTYPE EQU CYREG_PICU0_INTTYPE0 SCSI_Out__9__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__9__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__9__MASK EQU 0x01 @@ -1610,6 +1666,7 @@ SCSI_Out__ACK__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__ACK__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__ACK__DR EQU CYREG_PRT0_DR SCSI_Out__ACK__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__ACK__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__ACK__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__ACK__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__ACK__MASK EQU 0x40 @@ -1637,6 +1694,7 @@ SCSI_Out__ATN__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__ATN__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__ATN__DR EQU CYREG_PRT4_DR SCSI_Out__ATN__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__ATN__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_Out__ATN__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__ATN__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__ATN__MASK EQU 0x04 @@ -1664,6 +1722,7 @@ SCSI_Out__BSY__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__BSY__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__BSY__DR EQU CYREG_PRT0_DR SCSI_Out__BSY__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__BSY__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__BSY__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__BSY__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__BSY__MASK EQU 0x80 @@ -1691,6 +1750,7 @@ SCSI_Out__CD_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__CD_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__CD_raw__DR EQU CYREG_PRT0_DR SCSI_Out__CD_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__CD_raw__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__CD_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__CD_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__CD_raw__MASK EQU 0x04 @@ -1718,6 +1778,7 @@ SCSI_Out__DBP_raw__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__DBP_raw__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__DBP_raw__DR EQU CYREG_PRT4_DR SCSI_Out__DBP_raw__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__DBP_raw__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Out__DBP_raw__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__DBP_raw__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__DBP_raw__MASK EQU 0x08 @@ -1745,6 +1806,7 @@ SCSI_Out__IO_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__IO_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__IO_raw__DR EQU CYREG_PRT0_DR SCSI_Out__IO_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__IO_raw__INTTYPE EQU CYREG_PICU0_INTTYPE0 SCSI_Out__IO_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__IO_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__IO_raw__MASK EQU 0x01 @@ -1772,6 +1834,7 @@ SCSI_Out__MSG_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__MSG_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__MSG_raw__DR EQU CYREG_PRT0_DR SCSI_Out__MSG_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__MSG_raw__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_Out__MSG_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__MSG_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__MSG_raw__MASK EQU 0x10 @@ -1799,6 +1862,7 @@ SCSI_Out__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__REQ__DR EQU CYREG_PRT0_DR SCSI_Out__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE1 SCSI_Out__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__REQ__MASK EQU 0x02 @@ -1826,6 +1890,7 @@ SCSI_Out__RST__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__RST__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__RST__DR EQU CYREG_PRT0_DR SCSI_Out__RST__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__RST__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_Out__RST__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__RST__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__RST__MASK EQU 0x20 @@ -1853,6 +1918,7 @@ SCSI_Out__SEL__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__SEL__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__SEL__DR EQU CYREG_PRT0_DR SCSI_Out__SEL__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__SEL__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__SEL__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__SEL__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__SEL__MASK EQU 0x08 @@ -1875,15 +1941,15 @@ SCSI_Out_Bits_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Bits_Sync_ctrl_reg__0__POS EQU 0 SCSI_Out_Bits_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_Out_Bits_Sync_ctrl_reg__1__POS EQU 1 -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK SCSI_Out_Bits_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_Out_Bits_Sync_ctrl_reg__2__POS EQU 2 SCSI_Out_Bits_Sync_ctrl_reg__3__MASK EQU 0x08 @@ -1896,28 +1962,37 @@ SCSI_Out_Bits_Sync_ctrl_reg__6__MASK EQU 0x40 SCSI_Out_Bits_Sync_ctrl_reg__6__POS EQU 6 SCSI_Out_Bits_Sync_ctrl_reg__7__MASK EQU 0x80 SCSI_Out_Bits_Sync_ctrl_reg__7__POS EQU 7 -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB11_CTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB11_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB11_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB05_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB05_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB05_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB05_ST_CTL SCSI_Out_Bits_Sync_ctrl_reg__MASK EQU 0xFF -SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB11_MSK +SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB05_MSK /* SCSI_Out_Ctl */ SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB15_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB15_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB15_ST_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB15_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB15_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_06_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB05_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB05_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB05_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB05_ST_CTL SCSI_Out_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB15_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB15_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB15_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB05_MSK /* SCSI_Out_DBx */ SCSI_Out_DBx__0__AG EQU CYREG_PRT6_AG @@ -1931,6 +2006,7 @@ SCSI_Out_DBx__0__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__0__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__0__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__0__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__0__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Out_DBx__0__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__0__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__0__MASK EQU 0x08 @@ -1958,6 +2034,7 @@ SCSI_Out_DBx__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__1__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__1__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Out_DBx__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__1__MASK EQU 0x04 @@ -1985,6 +2062,7 @@ SCSI_Out_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__2__MASK EQU 0x02 @@ -2012,6 +2090,7 @@ SCSI_Out_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__3__MASK EQU 0x01 @@ -2039,6 +2118,7 @@ SCSI_Out_DBx__4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__4__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__4__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Out_DBx__4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__4__MASK EQU 0x80 @@ -2066,6 +2146,7 @@ SCSI_Out_DBx__5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__5__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__5__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_Out_DBx__5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__5__MASK EQU 0x40 @@ -2093,6 +2174,7 @@ SCSI_Out_DBx__6__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__6__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__6__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__6__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__6__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out_DBx__6__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__6__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__6__MASK EQU 0x20 @@ -2120,6 +2202,7 @@ SCSI_Out_DBx__7__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__7__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__7__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__7__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__7__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out_DBx__7__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__7__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__7__MASK EQU 0x10 @@ -2147,6 +2230,7 @@ SCSI_Out_DBx__DB0__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB0__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB0__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB0__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB0__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Out_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB0__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB0__MASK EQU 0x08 @@ -2174,6 +2258,7 @@ SCSI_Out_DBx__DB1__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB1__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB1__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB1__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Out_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB1__MASK EQU 0x04 @@ -2201,6 +2286,7 @@ SCSI_Out_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB2__MASK EQU 0x02 @@ -2228,6 +2314,7 @@ SCSI_Out_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB3__MASK EQU 0x01 @@ -2255,6 +2342,7 @@ SCSI_Out_DBx__DB4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB4__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB4__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Out_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB4__MASK EQU 0x80 @@ -2282,6 +2370,7 @@ SCSI_Out_DBx__DB5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB5__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB5__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_Out_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB5__MASK EQU 0x40 @@ -2309,6 +2398,7 @@ SCSI_Out_DBx__DB6__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB6__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB6__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB6__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB6__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB6__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB6__MASK EQU 0x20 @@ -2336,6 +2426,7 @@ SCSI_Out_DBx__DB7__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB7__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB7__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB7__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB7__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB7__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB7__MASK EQU 0x10 @@ -2407,6 +2498,7 @@ SCSI_Noise__0__DM1 EQU CYREG_PRT12_DM1 SCSI_Noise__0__DM2 EQU CYREG_PRT12_DM2 SCSI_Noise__0__DR EQU CYREG_PRT12_DR SCSI_Noise__0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_Noise__0__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_Noise__0__MASK EQU 0x20 SCSI_Noise__0__PC EQU CYREG_PRT12_PC5 SCSI_Noise__0__PORT EQU 12 @@ -2435,6 +2527,7 @@ SCSI_Noise__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__1__DR EQU CYREG_PRT6_DR SCSI_Noise__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__1__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Noise__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__1__MASK EQU 0x10 @@ -2462,6 +2555,7 @@ SCSI_Noise__2__DM1 EQU CYREG_PRT5_DM1 SCSI_Noise__2__DM2 EQU CYREG_PRT5_DM2 SCSI_Noise__2__DR EQU CYREG_PRT5_DR SCSI_Noise__2__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Noise__2__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Noise__2__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Noise__2__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Noise__2__MASK EQU 0x01 @@ -2489,6 +2583,7 @@ SCSI_Noise__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__3__DR EQU CYREG_PRT6_DR SCSI_Noise__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_Noise__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__3__MASK EQU 0x40 @@ -2516,6 +2611,7 @@ SCSI_Noise__4__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__4__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__4__DR EQU CYREG_PRT6_DR SCSI_Noise__4__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__4__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Noise__4__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__4__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__4__MASK EQU 0x20 @@ -2543,6 +2639,7 @@ SCSI_Noise__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__ACK__DR EQU CYREG_PRT6_DR SCSI_Noise__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Noise__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__ACK__MASK EQU 0x20 @@ -2568,6 +2665,7 @@ SCSI_Noise__ATN__DM1 EQU CYREG_PRT12_DM1 SCSI_Noise__ATN__DM2 EQU CYREG_PRT12_DM2 SCSI_Noise__ATN__DR EQU CYREG_PRT12_DR SCSI_Noise__ATN__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_Noise__ATN__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_Noise__ATN__MASK EQU 0x20 SCSI_Noise__ATN__PC EQU CYREG_PRT12_PC5 SCSI_Noise__ATN__PORT EQU 12 @@ -2596,6 +2694,7 @@ SCSI_Noise__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__BSY__DR EQU CYREG_PRT6_DR SCSI_Noise__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Noise__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__BSY__MASK EQU 0x10 @@ -2623,6 +2722,7 @@ SCSI_Noise__RST__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__RST__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__RST__DR EQU CYREG_PRT6_DR SCSI_Noise__RST__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__RST__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_Noise__RST__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__RST__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__RST__MASK EQU 0x40 @@ -2650,6 +2750,7 @@ SCSI_Noise__SEL__DM1 EQU CYREG_PRT5_DM1 SCSI_Noise__SEL__DM2 EQU CYREG_PRT5_DM2 SCSI_Noise__SEL__DR EQU CYREG_PRT5_DR SCSI_Noise__SEL__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Noise__SEL__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Noise__SEL__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Noise__SEL__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Noise__SEL__MASK EQU 0x01 @@ -2727,11 +2828,7 @@ scsiTarget_StatusReg__4__MASK EQU 0x10 scsiTarget_StatusReg__4__POS EQU 4 scsiTarget_StatusReg__MASK EQU 0x1F scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB02_MSK -scsiTarget_StatusReg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -scsiTarget_StatusReg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL -scsiTarget_StatusReg__STATUS_CNT_REG EQU CYREG_B0_UDB02_ST_CTL -scsiTarget_StatusReg__STATUS_CONTROL_REG EQU CYREG_B0_UDB02_ST_CTL scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB02_ST /* Debug_Timer_Interrupt */ @@ -2853,8 +2950,8 @@ SCSI_Filtered_sts_sts_reg__0__MASK EQU 0x01 SCSI_Filtered_sts_sts_reg__0__POS EQU 0 SCSI_Filtered_sts_sts_reg__1__MASK EQU 0x02 SCSI_Filtered_sts_sts_reg__1__POS EQU 1 -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB10_11_ST +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB01_02_ACTL +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB01_02_ST SCSI_Filtered_sts_sts_reg__2__MASK EQU 0x04 SCSI_Filtered_sts_sts_reg__2__POS EQU 2 SCSI_Filtered_sts_sts_reg__3__MASK EQU 0x08 @@ -2862,81 +2959,77 @@ SCSI_Filtered_sts_sts_reg__3__POS EQU 3 SCSI_Filtered_sts_sts_reg__4__MASK EQU 0x10 SCSI_Filtered_sts_sts_reg__4__POS EQU 4 SCSI_Filtered_sts_sts_reg__MASK EQU 0x1F -SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB10_MSK -SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL -SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB10_ST +SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB01_MSK +SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB01_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB01_ST /* SCSI_CTL_PHASE */ SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS EQU 0 SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS EQU 1 -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS EQU 2 -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB02_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB02_ST_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB02_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB11_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB11_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB11_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB11_ST_CTL SCSI_CTL_PHASE_Sync_ctrl_reg__MASK EQU 0x07 -SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB02_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB11_MSK /* SCSI_Glitch_Ctl */ SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB04_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB04_ST_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB04_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB04_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB10_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB10_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB10_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB10_ST_CTL SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB04_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB04_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB04_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB10_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB10_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB10_MSK /* SCSI_Parity_Error */ SCSI_Parity_Error_sts_sts_reg__0__MASK EQU 0x01 SCSI_Parity_Error_sts_sts_reg__0__POS EQU 0 -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB04_05_ST SCSI_Parity_Error_sts_sts_reg__MASK EQU 0x01 -SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK -SCSI_Parity_Error_sts_sts_reg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Parity_Error_sts_sts_reg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_CNT_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Parity_Error_sts_sts_reg__STATUS_CONTROL_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST +SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB04_MSK +SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL +SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB04_ST /* Miscellaneous */ BCLK__BUS_CLK__HZ EQU 50000000 BCLK__BUS_CLK__KHZ EQU 50000 BCLK__BUS_CLK__MHZ EQU 50 -CYDEV_CHIP_DIE_GEN4 EQU 2 CYDEV_CHIP_DIE_LEOPARD EQU 1 -CYDEV_CHIP_DIE_PANTHER EQU 12 -CYDEV_CHIP_DIE_PSOC4A EQU 5 -CYDEV_CHIP_DIE_PSOC5LP EQU 11 +CYDEV_CHIP_DIE_PANTHER EQU 18 +CYDEV_CHIP_DIE_PSOC4A EQU 10 +CYDEV_CHIP_DIE_PSOC5LP EQU 17 +CYDEV_CHIP_DIE_TMA4 EQU 2 CYDEV_CHIP_DIE_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_PSOC3 EQU 1 CYDEV_CHIP_FAMILY_PSOC4 EQU 2 @@ -2945,23 +3038,26 @@ CYDEV_CHIP_FAMILY_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_USED EQU CYDEV_CHIP_FAMILY_PSOC5 CYDEV_CHIP_JTAG_ID EQU 0x2E133069 CYDEV_CHIP_MEMBER_3A EQU 1 -CYDEV_CHIP_MEMBER_4A EQU 5 -CYDEV_CHIP_MEMBER_4C EQU 9 -CYDEV_CHIP_MEMBER_4D EQU 3 +CYDEV_CHIP_MEMBER_4A EQU 10 +CYDEV_CHIP_MEMBER_4C EQU 15 +CYDEV_CHIP_MEMBER_4D EQU 6 CYDEV_CHIP_MEMBER_4E EQU 4 -CYDEV_CHIP_MEMBER_4F EQU 6 +CYDEV_CHIP_MEMBER_4F EQU 11 CYDEV_CHIP_MEMBER_4G EQU 2 -CYDEV_CHIP_MEMBER_4L EQU 8 -CYDEV_CHIP_MEMBER_4M EQU 7 -CYDEV_CHIP_MEMBER_5A EQU 11 -CYDEV_CHIP_MEMBER_5B EQU 10 +CYDEV_CHIP_MEMBER_4H EQU 9 +CYDEV_CHIP_MEMBER_4I EQU 14 +CYDEV_CHIP_MEMBER_4J EQU 7 +CYDEV_CHIP_MEMBER_4K EQU 8 +CYDEV_CHIP_MEMBER_4L EQU 13 +CYDEV_CHIP_MEMBER_4M EQU 12 +CYDEV_CHIP_MEMBER_4N EQU 5 +CYDEV_CHIP_MEMBER_4U EQU 3 +CYDEV_CHIP_MEMBER_5A EQU 17 +CYDEV_CHIP_MEMBER_5B EQU 16 CYDEV_CHIP_MEMBER_UNKNOWN EQU 0 CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_DIE_ACTUAL EQU CYDEV_CHIP_DIE_EXPECT -CYDEV_CHIP_REV_GEN4_ES EQU 17 -CYDEV_CHIP_REV_GEN4_ES2 EQU 33 -CYDEV_CHIP_REV_GEN4_PRODUCTION EQU 17 CYDEV_CHIP_REV_LEOPARD_ES1 EQU 0 CYDEV_CHIP_REV_LEOPARD_ES2 EQU 1 CYDEV_CHIP_REV_LEOPARD_ES3 EQU 3 @@ -2973,6 +3069,9 @@ CYDEV_CHIP_REV_PSOC4A_ES0 EQU 17 CYDEV_CHIP_REV_PSOC4A_PRODUCTION EQU 17 CYDEV_CHIP_REV_PSOC5LP_ES0 EQU 0 CYDEV_CHIP_REV_PSOC5LP_PRODUCTION EQU 0 +CYDEV_CHIP_REV_TMA4_ES EQU 17 +CYDEV_CHIP_REV_TMA4_ES2 EQU 33 +CYDEV_CHIP_REV_TMA4_PRODUCTION EQU 17 CYDEV_CHIP_REVISION_3A_ES1 EQU 0 CYDEV_CHIP_REVISION_3A_ES2 EQU 1 CYDEV_CHIP_REVISION_3A_ES3 EQU 3 @@ -2983,12 +3082,19 @@ CYDEV_CHIP_REVISION_4C_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4D_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4E_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION_256K EQU 0 CYDEV_CHIP_REVISION_4G_ES EQU 17 CYDEV_CHIP_REVISION_4G_ES2 EQU 33 CYDEV_CHIP_REVISION_4G_PRODUCTION EQU 17 +CYDEV_CHIP_REVISION_4H_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4I_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4J_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4K_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4L_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4N_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4U_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_5A_ES0 EQU 0 CYDEV_CHIP_REVISION_5A_ES1 EQU 1 CYDEV_CHIP_REVISION_5A_PRODUCTION EQU 1 @@ -3021,6 +3127,8 @@ CYDEV_ECC_ENABLE EQU 0 CYDEV_HEAP_SIZE EQU 0x0400 CYDEV_INSTRUCT_CACHE_ENABLED EQU 1 CYDEV_INTR_RISING EQU 0x0000007E +CYDEV_IS_EXPORTING_CODE EQU 0 +CYDEV_IS_IMPORTING_CODE EQU 0 CYDEV_PROJ_TYPE EQU 2 CYDEV_PROJ_TYPE_BOOTLOADER EQU 1 CYDEV_PROJ_TYPE_LAUNCHER EQU 5 diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc index 0d559b6e..d456cafe 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc @@ -4,6 +4,7 @@ INCLUDED_CYFITTERRV_INC EQU 1 GET cydevicerv_trm.inc ; LED1 +LED1__0__INTTYPE EQU CYREG_PICU12_INTTYPE3 LED1__0__MASK EQU 0x08 LED1__0__PC EQU CYREG_PRT12_PC3 LED1__0__PORT EQU 12 @@ -17,6 +18,7 @@ LED1__DM1 EQU CYREG_PRT12_DM1 LED1__DM2 EQU CYREG_PRT12_DM2 LED1__DR EQU CYREG_PRT12_DR LED1__INP_DIS EQU CYREG_PRT12_INP_DIS +LED1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU12_BASE LED1__MASK EQU 0x08 LED1__PORT EQU 12 LED1__PRT EQU CYREG_PRT12_PRT @@ -35,6 +37,7 @@ LED1__SIO_REG_HIFREQ EQU CYREG_PRT12_SIO_REG_HIFREQ LED1__SLW EQU CYREG_PRT12_SLW ; SD_CD +SD_CD__0__INTTYPE EQU CYREG_PICU3_INTTYPE6 SD_CD__0__MASK EQU 0x40 SD_CD__0__PC EQU CYREG_PRT3_PC6 SD_CD__0__PORT EQU 3 @@ -50,6 +53,7 @@ SD_CD__DM1 EQU CYREG_PRT3_DM1 SD_CD__DM2 EQU CYREG_PRT3_DM2 SD_CD__DR EQU CYREG_PRT3_DR SD_CD__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CD__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CD__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CD__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CD__MASK EQU 0x40 @@ -67,6 +71,7 @@ SD_CD__SHIFT EQU 6 SD_CD__SLW EQU CYREG_PRT3_SLW ; SD_CS +SD_CS__0__INTTYPE EQU CYREG_PICU3_INTTYPE4 SD_CS__0__MASK EQU 0x10 SD_CS__0__PC EQU CYREG_PRT3_PC4 SD_CS__0__PORT EQU 3 @@ -82,6 +87,7 @@ SD_CS__DM1 EQU CYREG_PRT3_DM1 SD_CS__DM2 EQU CYREG_PRT3_DM2 SD_CS__DR EQU CYREG_PRT3_DR SD_CS__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CS__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CS__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CS__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CS__MASK EQU 0x10 @@ -119,6 +125,7 @@ USBFS_bus_reset__INTC_SET_EN_REG EQU CYREG_NVIC_SETENA0 USBFS_bus_reset__INTC_SET_PD_REG EQU CYREG_NVIC_SETPEND0 ; USBFS_Dm +USBFS_Dm__0__INTTYPE EQU CYREG_PICU15_INTTYPE7 USBFS_Dm__0__MASK EQU 0x80 USBFS_Dm__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC1 USBFS_Dm__0__PORT EQU 15 @@ -134,6 +141,7 @@ USBFS_Dm__DM1 EQU CYREG_PRT15_DM1 USBFS_Dm__DM2 EQU CYREG_PRT15_DM2 USBFS_Dm__DR EQU CYREG_PRT15_DR USBFS_Dm__INP_DIS EQU CYREG_PRT15_INP_DIS +USBFS_Dm__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dm__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dm__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dm__MASK EQU 0x80 @@ -151,6 +159,7 @@ USBFS_Dm__SHIFT EQU 7 USBFS_Dm__SLW EQU CYREG_PRT15_SLW ; USBFS_Dp +USBFS_Dp__0__INTTYPE EQU CYREG_PICU15_INTTYPE6 USBFS_Dp__0__MASK EQU 0x40 USBFS_Dp__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC0 USBFS_Dp__0__PORT EQU 15 @@ -167,6 +176,7 @@ USBFS_Dp__DM2 EQU CYREG_PRT15_DM2 USBFS_Dp__DR EQU CYREG_PRT15_DR USBFS_Dp__INP_DIS EQU CYREG_PRT15_INP_DIS USBFS_Dp__INTSTAT EQU CYREG_PICU15_INTSTAT +USBFS_Dp__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dp__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dp__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dp__MASK EQU 0x40 @@ -381,34 +391,34 @@ USBFS_USB__USBIO_CR0 EQU CYREG_USB_USBIO_CR0 USBFS_USB__USBIO_CR1 EQU CYREG_USB_USBIO_CR1 ; SDCard_BSPIM -SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB05_06_CTL -SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK -SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL -SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B1_UDB05_CTL -SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B1_UDB05_CTL -SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B1_UDB05_MSK -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B1_UDB05_06_ST -SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B1_UDB05_MSK -SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B1_UDB05_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B1_UDB05_ST -SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL -SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB06_07_ST +SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB07_08_CTL +SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB07_08_MSK +SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B0_UDB07_CTL +SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B0_UDB07_CTL +SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST +SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB07_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B0_UDB07_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B0_UDB07_ST +SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB08_09_ACTL +SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB08_09_ST SDCard_BSPIM_RxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_RxStsReg__4__POS EQU 4 SDCard_BSPIM_RxStsReg__5__MASK EQU 0x20 @@ -416,9 +426,9 @@ SDCard_BSPIM_RxStsReg__5__POS EQU 5 SDCard_BSPIM_RxStsReg__6__MASK EQU 0x40 SDCard_BSPIM_RxStsReg__6__POS EQU 6 SDCard_BSPIM_RxStsReg__MASK EQU 0x70 -SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB06_MSK -SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL -SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB06_ST +SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB08_MSK +SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB08_ACTL +SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB08_ST SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG EQU CYREG_B1_UDB04_05_A0 SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG EQU CYREG_B1_UDB04_05_A1 SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG EQU CYREG_B1_UDB04_05_D0 @@ -454,6 +464,7 @@ SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B1_UDB07_ST ; SD_SCK +SD_SCK__0__INTTYPE EQU CYREG_PICU3_INTTYPE2 SD_SCK__0__MASK EQU 0x04 SD_SCK__0__PC EQU CYREG_PRT3_PC2 SD_SCK__0__PORT EQU 3 @@ -469,6 +480,7 @@ SD_SCK__DM1 EQU CYREG_PRT3_DM1 SD_SCK__DM2 EQU CYREG_PRT3_DM2 SD_SCK__DR EQU CYREG_PRT3_DR SD_SCK__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_SCK__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_SCK__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_SCK__LCD_EN EQU CYREG_PRT3_LCD_EN SD_SCK__MASK EQU 0x04 @@ -497,6 +509,7 @@ SCSI_In__0__DM1 EQU CYREG_PRT2_DM1 SCSI_In__0__DM2 EQU CYREG_PRT2_DM2 SCSI_In__0__DR EQU CYREG_PRT2_DR SCSI_In__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__0__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_In__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__0__MASK EQU 0x01 @@ -524,6 +537,7 @@ SCSI_In__1__DM1 EQU CYREG_PRT6_DM1 SCSI_In__1__DM2 EQU CYREG_PRT6_DM2 SCSI_In__1__DR EQU CYREG_PRT6_DR SCSI_In__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In__1__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In__1__MASK EQU 0x80 @@ -551,6 +565,7 @@ SCSI_In__2__DM1 EQU CYREG_PRT5_DM1 SCSI_In__2__DM2 EQU CYREG_PRT5_DM2 SCSI_In__2__DR EQU CYREG_PRT5_DR SCSI_In__2__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__2__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_In__2__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__2__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__2__MASK EQU 0x02 @@ -578,6 +593,7 @@ SCSI_In__3__DM1 EQU CYREG_PRT5_DM1 SCSI_In__3__DM2 EQU CYREG_PRT5_DM2 SCSI_In__3__DR EQU CYREG_PRT5_DR SCSI_In__3__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__3__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In__3__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__3__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__3__MASK EQU 0x04 @@ -605,6 +621,7 @@ SCSI_In__4__DM1 EQU CYREG_PRT5_DM1 SCSI_In__4__DM2 EQU CYREG_PRT5_DM2 SCSI_In__4__DR EQU CYREG_PRT5_DR SCSI_In__4__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__4__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In__4__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__4__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__4__MASK EQU 0x08 @@ -632,6 +649,7 @@ SCSI_In__CD__DM1 EQU CYREG_PRT5_DM1 SCSI_In__CD__DM2 EQU CYREG_PRT5_DM2 SCSI_In__CD__DR EQU CYREG_PRT5_DR SCSI_In__CD__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__CD__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_In__CD__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__CD__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__CD__MASK EQU 0x02 @@ -659,6 +677,7 @@ SCSI_In__DBP__DM1 EQU CYREG_PRT2_DM1 SCSI_In__DBP__DM2 EQU CYREG_PRT2_DM2 SCSI_In__DBP__DR EQU CYREG_PRT2_DR SCSI_In__DBP__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__DBP__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_In__DBP__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__DBP__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__DBP__MASK EQU 0x01 @@ -686,6 +705,7 @@ SCSI_In__IO__DM1 EQU CYREG_PRT5_DM1 SCSI_In__IO__DM2 EQU CYREG_PRT5_DM2 SCSI_In__IO__DR EQU CYREG_PRT5_DR SCSI_In__IO__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__IO__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In__IO__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__IO__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__IO__MASK EQU 0x08 @@ -713,6 +733,7 @@ SCSI_In__MSG__DM1 EQU CYREG_PRT6_DM1 SCSI_In__MSG__DM2 EQU CYREG_PRT6_DM2 SCSI_In__MSG__DR EQU CYREG_PRT6_DR SCSI_In__MSG__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In__MSG__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In__MSG__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In__MSG__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In__MSG__MASK EQU 0x80 @@ -740,6 +761,7 @@ SCSI_In__REQ__DM1 EQU CYREG_PRT5_DM1 SCSI_In__REQ__DM2 EQU CYREG_PRT5_DM2 SCSI_In__REQ__DR EQU CYREG_PRT5_DR SCSI_In__REQ__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In__REQ__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In__REQ__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In__REQ__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In__REQ__MASK EQU 0x04 @@ -767,6 +789,7 @@ SCSI_In_DBx__0__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__0__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__0__DR EQU CYREG_PRT12_DR SCSI_In_DBx__0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__0__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__0__MASK EQU 0x10 SCSI_In_DBx__0__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__0__PORT EQU 12 @@ -795,6 +818,7 @@ SCSI_In_DBx__1__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__1__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__1__DR EQU CYREG_PRT2_DR SCSI_In_DBx__1__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__1__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_In_DBx__1__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__1__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__1__MASK EQU 0x80 @@ -822,6 +846,7 @@ SCSI_In_DBx__2__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__2__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__2__DR EQU CYREG_PRT2_DR SCSI_In_DBx__2__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__2__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_In_DBx__2__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__2__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__2__MASK EQU 0x40 @@ -849,6 +874,7 @@ SCSI_In_DBx__3__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__3__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__3__DR EQU CYREG_PRT2_DR SCSI_In_DBx__3__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__3__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__3__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__3__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__3__MASK EQU 0x20 @@ -876,6 +902,7 @@ SCSI_In_DBx__4__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__4__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__4__DR EQU CYREG_PRT2_DR SCSI_In_DBx__4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__4__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__4__MASK EQU 0x10 @@ -903,6 +930,7 @@ SCSI_In_DBx__5__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__5__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__5__DR EQU CYREG_PRT2_DR SCSI_In_DBx__5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__5__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_In_DBx__5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__5__MASK EQU 0x08 @@ -930,6 +958,7 @@ SCSI_In_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_In_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__6__MASK EQU 0x04 @@ -957,6 +986,7 @@ SCSI_In_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__7__MASK EQU 0x02 @@ -982,6 +1012,7 @@ SCSI_In_DBx__DB0__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB0__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB0__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB0__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__DB0__MASK EQU 0x10 SCSI_In_DBx__DB0__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__DB0__PORT EQU 12 @@ -1010,6 +1041,7 @@ SCSI_In_DBx__DB1__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB1__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB1__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB1__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB1__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_In_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB1__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB1__MASK EQU 0x80 @@ -1037,6 +1069,7 @@ SCSI_In_DBx__DB2__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB2__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB2__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB2__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB2__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_In_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB2__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB2__MASK EQU 0x40 @@ -1064,6 +1097,7 @@ SCSI_In_DBx__DB3__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB3__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB3__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB3__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB3__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB3__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB3__MASK EQU 0x20 @@ -1091,6 +1125,7 @@ SCSI_In_DBx__DB4__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB4__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB4__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB4__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB4__MASK EQU 0x10 @@ -1118,6 +1153,7 @@ SCSI_In_DBx__DB5__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB5__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB5__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB5__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_In_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB5__MASK EQU 0x08 @@ -1145,6 +1181,7 @@ SCSI_In_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_In_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB6__MASK EQU 0x04 @@ -1172,6 +1209,7 @@ SCSI_In_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB7__MASK EQU 0x02 @@ -1190,6 +1228,7 @@ SCSI_In_DBx__DB7__SHIFT EQU 1 SCSI_In_DBx__DB7__SLW EQU CYREG_PRT2_SLW ; SD_DAT1 +SD_DAT1__0__INTTYPE EQU CYREG_PICU3_INTTYPE0 SD_DAT1__0__MASK EQU 0x01 SD_DAT1__0__PC EQU CYREG_PRT3_PC0 SD_DAT1__0__PORT EQU 3 @@ -1205,6 +1244,7 @@ SD_DAT1__DM1 EQU CYREG_PRT3_DM1 SD_DAT1__DM2 EQU CYREG_PRT3_DM2 SD_DAT1__DR EQU CYREG_PRT3_DR SD_DAT1__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_DAT1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_DAT1__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_DAT1__LCD_EN EQU CYREG_PRT3_LCD_EN SD_DAT1__MASK EQU 0x01 @@ -1222,6 +1262,7 @@ SD_DAT1__SHIFT EQU 0 SD_DAT1__SLW EQU CYREG_PRT3_SLW ; SD_DAT2 +SD_DAT2__0__INTTYPE EQU CYREG_PICU3_INTTYPE5 SD_DAT2__0__MASK EQU 0x20 SD_DAT2__0__PC EQU CYREG_PRT3_PC5 SD_DAT2__0__PORT EQU 3 @@ -1237,6 +1278,7 @@ SD_DAT2__DM1 EQU CYREG_PRT3_DM1 SD_DAT2__DM2 EQU CYREG_PRT3_DM2 SD_DAT2__DR EQU CYREG_PRT3_DR SD_DAT2__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_DAT2__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_DAT2__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_DAT2__LCD_EN EQU CYREG_PRT3_LCD_EN SD_DAT2__MASK EQU 0x20 @@ -1254,6 +1296,7 @@ SD_DAT2__SHIFT EQU 5 SD_DAT2__SLW EQU CYREG_PRT3_SLW ; SD_MISO +SD_MISO__0__INTTYPE EQU CYREG_PICU3_INTTYPE1 SD_MISO__0__MASK EQU 0x02 SD_MISO__0__PC EQU CYREG_PRT3_PC1 SD_MISO__0__PORT EQU 3 @@ -1269,6 +1312,7 @@ SD_MISO__DM1 EQU CYREG_PRT3_DM1 SD_MISO__DM2 EQU CYREG_PRT3_DM2 SD_MISO__DR EQU CYREG_PRT3_DR SD_MISO__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MISO__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MISO__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MISO__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MISO__MASK EQU 0x02 @@ -1286,6 +1330,7 @@ SD_MISO__SHIFT EQU 1 SD_MISO__SLW EQU CYREG_PRT3_SLW ; SD_MOSI +SD_MOSI__0__INTTYPE EQU CYREG_PICU3_INTTYPE3 SD_MOSI__0__MASK EQU 0x08 SD_MOSI__0__PC EQU CYREG_PRT3_PC3 SD_MOSI__0__PORT EQU 3 @@ -1301,6 +1346,7 @@ SD_MOSI__DM1 EQU CYREG_PRT3_DM1 SD_MOSI__DM2 EQU CYREG_PRT3_DM2 SD_MOSI__DR EQU CYREG_PRT3_DR SD_MOSI__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MOSI__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MOSI__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MOSI__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MOSI__MASK EQU 0x08 @@ -1340,6 +1386,7 @@ SCSI_Out__0__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__0__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__0__DR EQU CYREG_PRT4_DR SCSI_Out__0__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__0__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Out__0__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__0__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__0__MASK EQU 0x08 @@ -1367,6 +1414,7 @@ SCSI_Out__1__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__1__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__1__DR EQU CYREG_PRT4_DR SCSI_Out__1__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__1__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_Out__1__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__1__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__1__MASK EQU 0x04 @@ -1394,6 +1442,7 @@ SCSI_Out__2__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__2__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__2__DR EQU CYREG_PRT0_DR SCSI_Out__2__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__2__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__2__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__2__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__2__MASK EQU 0x80 @@ -1421,6 +1470,7 @@ SCSI_Out__3__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__3__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__3__DR EQU CYREG_PRT0_DR SCSI_Out__3__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__3__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__3__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__3__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__3__MASK EQU 0x40 @@ -1448,6 +1498,7 @@ SCSI_Out__4__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__4__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__4__DR EQU CYREG_PRT0_DR SCSI_Out__4__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__4__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_Out__4__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__4__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__4__MASK EQU 0x20 @@ -1475,6 +1526,7 @@ SCSI_Out__5__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__5__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__5__DR EQU CYREG_PRT0_DR SCSI_Out__5__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__5__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_Out__5__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__5__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__5__MASK EQU 0x10 @@ -1502,6 +1554,7 @@ SCSI_Out__6__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__6__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__6__DR EQU CYREG_PRT0_DR SCSI_Out__6__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__6__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__6__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__6__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__6__MASK EQU 0x08 @@ -1529,6 +1582,7 @@ SCSI_Out__7__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__7__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__7__DR EQU CYREG_PRT0_DR SCSI_Out__7__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__7__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__7__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__7__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__7__MASK EQU 0x04 @@ -1556,6 +1610,7 @@ SCSI_Out__8__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__8__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__8__DR EQU CYREG_PRT0_DR SCSI_Out__8__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__8__INTTYPE EQU CYREG_PICU0_INTTYPE1 SCSI_Out__8__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__8__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__8__MASK EQU 0x02 @@ -1583,6 +1638,7 @@ SCSI_Out__9__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__9__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__9__DR EQU CYREG_PRT0_DR SCSI_Out__9__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__9__INTTYPE EQU CYREG_PICU0_INTTYPE0 SCSI_Out__9__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__9__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__9__MASK EQU 0x01 @@ -1610,6 +1666,7 @@ SCSI_Out__ACK__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__ACK__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__ACK__DR EQU CYREG_PRT0_DR SCSI_Out__ACK__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__ACK__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__ACK__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__ACK__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__ACK__MASK EQU 0x40 @@ -1637,6 +1694,7 @@ SCSI_Out__ATN__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__ATN__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__ATN__DR EQU CYREG_PRT4_DR SCSI_Out__ATN__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__ATN__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_Out__ATN__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__ATN__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__ATN__MASK EQU 0x04 @@ -1664,6 +1722,7 @@ SCSI_Out__BSY__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__BSY__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__BSY__DR EQU CYREG_PRT0_DR SCSI_Out__BSY__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__BSY__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__BSY__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__BSY__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__BSY__MASK EQU 0x80 @@ -1691,6 +1750,7 @@ SCSI_Out__CD_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__CD_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__CD_raw__DR EQU CYREG_PRT0_DR SCSI_Out__CD_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__CD_raw__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__CD_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__CD_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__CD_raw__MASK EQU 0x04 @@ -1718,6 +1778,7 @@ SCSI_Out__DBP_raw__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__DBP_raw__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__DBP_raw__DR EQU CYREG_PRT4_DR SCSI_Out__DBP_raw__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__DBP_raw__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Out__DBP_raw__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__DBP_raw__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__DBP_raw__MASK EQU 0x08 @@ -1745,6 +1806,7 @@ SCSI_Out__IO_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__IO_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__IO_raw__DR EQU CYREG_PRT0_DR SCSI_Out__IO_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__IO_raw__INTTYPE EQU CYREG_PICU0_INTTYPE0 SCSI_Out__IO_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__IO_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__IO_raw__MASK EQU 0x01 @@ -1772,6 +1834,7 @@ SCSI_Out__MSG_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__MSG_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__MSG_raw__DR EQU CYREG_PRT0_DR SCSI_Out__MSG_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__MSG_raw__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_Out__MSG_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__MSG_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__MSG_raw__MASK EQU 0x10 @@ -1799,6 +1862,7 @@ SCSI_Out__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__REQ__DR EQU CYREG_PRT0_DR SCSI_Out__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE1 SCSI_Out__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__REQ__MASK EQU 0x02 @@ -1826,6 +1890,7 @@ SCSI_Out__RST__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__RST__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__RST__DR EQU CYREG_PRT0_DR SCSI_Out__RST__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__RST__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_Out__RST__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__RST__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__RST__MASK EQU 0x20 @@ -1853,6 +1918,7 @@ SCSI_Out__SEL__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__SEL__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__SEL__DR EQU CYREG_PRT0_DR SCSI_Out__SEL__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__SEL__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__SEL__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__SEL__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__SEL__MASK EQU 0x08 @@ -1875,15 +1941,15 @@ SCSI_Out_Bits_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Bits_Sync_ctrl_reg__0__POS EQU 0 SCSI_Out_Bits_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_Out_Bits_Sync_ctrl_reg__1__POS EQU 1 -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB11_12_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB11_12_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_06_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB05_06_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB05_06_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB05_06_MSK SCSI_Out_Bits_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_Out_Bits_Sync_ctrl_reg__2__POS EQU 2 SCSI_Out_Bits_Sync_ctrl_reg__3__MASK EQU 0x08 @@ -1896,28 +1962,37 @@ SCSI_Out_Bits_Sync_ctrl_reg__6__MASK EQU 0x40 SCSI_Out_Bits_Sync_ctrl_reg__6__POS EQU 6 SCSI_Out_Bits_Sync_ctrl_reg__7__MASK EQU 0x80 SCSI_Out_Bits_Sync_ctrl_reg__7__POS EQU 7 -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB11_CTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB11_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB11_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB05_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB05_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB05_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB05_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB05_ST_CTL SCSI_Out_Bits_Sync_ctrl_reg__MASK EQU 0xFF -SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB11_MSK +SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB05_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB05_MSK ; SCSI_Out_Ctl SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB15_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB15_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB15_ST_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB15_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB15_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_06_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB05_06_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB05_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB05_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB05_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB05_ST_CTL SCSI_Out_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB15_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB15_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB15_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB05_MSK ; SCSI_Out_DBx SCSI_Out_DBx__0__AG EQU CYREG_PRT6_AG @@ -1931,6 +2006,7 @@ SCSI_Out_DBx__0__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__0__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__0__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__0__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__0__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Out_DBx__0__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__0__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__0__MASK EQU 0x08 @@ -1958,6 +2034,7 @@ SCSI_Out_DBx__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__1__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__1__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Out_DBx__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__1__MASK EQU 0x04 @@ -1985,6 +2062,7 @@ SCSI_Out_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__2__MASK EQU 0x02 @@ -2012,6 +2090,7 @@ SCSI_Out_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__3__MASK EQU 0x01 @@ -2039,6 +2118,7 @@ SCSI_Out_DBx__4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__4__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__4__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Out_DBx__4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__4__MASK EQU 0x80 @@ -2066,6 +2146,7 @@ SCSI_Out_DBx__5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__5__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__5__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_Out_DBx__5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__5__MASK EQU 0x40 @@ -2093,6 +2174,7 @@ SCSI_Out_DBx__6__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__6__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__6__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__6__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__6__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out_DBx__6__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__6__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__6__MASK EQU 0x20 @@ -2120,6 +2202,7 @@ SCSI_Out_DBx__7__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__7__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__7__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__7__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__7__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out_DBx__7__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__7__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__7__MASK EQU 0x10 @@ -2147,6 +2230,7 @@ SCSI_Out_DBx__DB0__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB0__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB0__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB0__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB0__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Out_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB0__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB0__MASK EQU 0x08 @@ -2174,6 +2258,7 @@ SCSI_Out_DBx__DB1__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB1__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB1__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB1__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Out_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB1__MASK EQU 0x04 @@ -2201,6 +2286,7 @@ SCSI_Out_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB2__MASK EQU 0x02 @@ -2228,6 +2314,7 @@ SCSI_Out_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB3__MASK EQU 0x01 @@ -2255,6 +2342,7 @@ SCSI_Out_DBx__DB4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB4__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB4__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Out_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB4__MASK EQU 0x80 @@ -2282,6 +2370,7 @@ SCSI_Out_DBx__DB5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB5__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB5__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_Out_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB5__MASK EQU 0x40 @@ -2309,6 +2398,7 @@ SCSI_Out_DBx__DB6__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB6__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB6__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB6__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB6__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB6__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB6__MASK EQU 0x20 @@ -2336,6 +2426,7 @@ SCSI_Out_DBx__DB7__DM1 EQU CYREG_PRT4_DM1 SCSI_Out_DBx__DB7__DM2 EQU CYREG_PRT4_DM2 SCSI_Out_DBx__DB7__DR EQU CYREG_PRT4_DR SCSI_Out_DBx__DB7__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out_DBx__DB7__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out_DBx__DB7__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out_DBx__DB7__MASK EQU 0x10 @@ -2407,6 +2498,7 @@ SCSI_Noise__0__DM1 EQU CYREG_PRT12_DM1 SCSI_Noise__0__DM2 EQU CYREG_PRT12_DM2 SCSI_Noise__0__DR EQU CYREG_PRT12_DR SCSI_Noise__0__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_Noise__0__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_Noise__0__MASK EQU 0x20 SCSI_Noise__0__PC EQU CYREG_PRT12_PC5 SCSI_Noise__0__PORT EQU 12 @@ -2435,6 +2527,7 @@ SCSI_Noise__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__1__DR EQU CYREG_PRT6_DR SCSI_Noise__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__1__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Noise__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__1__MASK EQU 0x10 @@ -2462,6 +2555,7 @@ SCSI_Noise__2__DM1 EQU CYREG_PRT5_DM1 SCSI_Noise__2__DM2 EQU CYREG_PRT5_DM2 SCSI_Noise__2__DR EQU CYREG_PRT5_DR SCSI_Noise__2__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Noise__2__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Noise__2__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Noise__2__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Noise__2__MASK EQU 0x01 @@ -2489,6 +2583,7 @@ SCSI_Noise__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__3__DR EQU CYREG_PRT6_DR SCSI_Noise__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_Noise__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__3__MASK EQU 0x40 @@ -2516,6 +2611,7 @@ SCSI_Noise__4__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__4__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__4__DR EQU CYREG_PRT6_DR SCSI_Noise__4__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__4__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Noise__4__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__4__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__4__MASK EQU 0x20 @@ -2543,6 +2639,7 @@ SCSI_Noise__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__ACK__DR EQU CYREG_PRT6_DR SCSI_Noise__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Noise__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__ACK__MASK EQU 0x20 @@ -2568,6 +2665,7 @@ SCSI_Noise__ATN__DM1 EQU CYREG_PRT12_DM1 SCSI_Noise__ATN__DM2 EQU CYREG_PRT12_DM2 SCSI_Noise__ATN__DR EQU CYREG_PRT12_DR SCSI_Noise__ATN__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_Noise__ATN__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_Noise__ATN__MASK EQU 0x20 SCSI_Noise__ATN__PC EQU CYREG_PRT12_PC5 SCSI_Noise__ATN__PORT EQU 12 @@ -2596,6 +2694,7 @@ SCSI_Noise__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__BSY__DR EQU CYREG_PRT6_DR SCSI_Noise__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Noise__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__BSY__MASK EQU 0x10 @@ -2623,6 +2722,7 @@ SCSI_Noise__RST__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__RST__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__RST__DR EQU CYREG_PRT6_DR SCSI_Noise__RST__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__RST__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_Noise__RST__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__RST__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__RST__MASK EQU 0x40 @@ -2650,6 +2750,7 @@ SCSI_Noise__SEL__DM1 EQU CYREG_PRT5_DM1 SCSI_Noise__SEL__DM2 EQU CYREG_PRT5_DM2 SCSI_Noise__SEL__DR EQU CYREG_PRT5_DR SCSI_Noise__SEL__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Noise__SEL__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Noise__SEL__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Noise__SEL__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Noise__SEL__MASK EQU 0x01 @@ -2727,11 +2828,7 @@ scsiTarget_StatusReg__4__MASK EQU 0x10 scsiTarget_StatusReg__4__POS EQU 4 scsiTarget_StatusReg__MASK EQU 0x1F scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB02_MSK -scsiTarget_StatusReg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -scsiTarget_StatusReg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL -scsiTarget_StatusReg__STATUS_CNT_REG EQU CYREG_B0_UDB02_ST_CTL -scsiTarget_StatusReg__STATUS_CONTROL_REG EQU CYREG_B0_UDB02_ST_CTL scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB02_ST ; Debug_Timer_Interrupt @@ -2853,8 +2950,8 @@ SCSI_Filtered_sts_sts_reg__0__MASK EQU 0x01 SCSI_Filtered_sts_sts_reg__0__POS EQU 0 SCSI_Filtered_sts_sts_reg__1__MASK EQU 0x02 SCSI_Filtered_sts_sts_reg__1__POS EQU 1 -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB10_11_ST +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB01_02_ACTL +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB01_02_ST SCSI_Filtered_sts_sts_reg__2__MASK EQU 0x04 SCSI_Filtered_sts_sts_reg__2__POS EQU 2 SCSI_Filtered_sts_sts_reg__3__MASK EQU 0x08 @@ -2862,81 +2959,77 @@ SCSI_Filtered_sts_sts_reg__3__POS EQU 3 SCSI_Filtered_sts_sts_reg__4__MASK EQU 0x10 SCSI_Filtered_sts_sts_reg__4__POS EQU 4 SCSI_Filtered_sts_sts_reg__MASK EQU 0x1F -SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB10_MSK -SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL -SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB10_ST +SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB01_MSK +SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB01_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB01_ST ; SCSI_CTL_PHASE SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS EQU 0 SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS EQU 1 -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB02_03_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB02_03_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB11_12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB11_12_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB11_12_MSK SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS EQU 2 -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB02_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB02_ST_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB02_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB11_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB11_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB11_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB11_ST_CTL SCSI_CTL_PHASE_Sync_ctrl_reg__MASK EQU 0x07 -SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB02_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB11_MSK ; SCSI_Glitch_Ctl SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB04_05_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB04_05_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB04_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB04_ST_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB04_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB04_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB10_11_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB10_11_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB10_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB10_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB10_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB10_ST_CTL SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB04_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB04_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB04_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB10_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB10_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB10_MSK ; SCSI_Parity_Error SCSI_Parity_Error_sts_sts_reg__0__MASK EQU 0x01 SCSI_Parity_Error_sts_sts_reg__0__POS EQU 0 -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB04_05_ST SCSI_Parity_Error_sts_sts_reg__MASK EQU 0x01 -SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK -SCSI_Parity_Error_sts_sts_reg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Parity_Error_sts_sts_reg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB11_MSK_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_CNT_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Parity_Error_sts_sts_reg__STATUS_CONTROL_REG EQU CYREG_B0_UDB11_ST_CTL -SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST +SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB04_MSK +SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL +SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB04_ST ; Miscellaneous BCLK__BUS_CLK__HZ EQU 50000000 BCLK__BUS_CLK__KHZ EQU 50000 BCLK__BUS_CLK__MHZ EQU 50 -CYDEV_CHIP_DIE_GEN4 EQU 2 CYDEV_CHIP_DIE_LEOPARD EQU 1 -CYDEV_CHIP_DIE_PANTHER EQU 12 -CYDEV_CHIP_DIE_PSOC4A EQU 5 -CYDEV_CHIP_DIE_PSOC5LP EQU 11 +CYDEV_CHIP_DIE_PANTHER EQU 18 +CYDEV_CHIP_DIE_PSOC4A EQU 10 +CYDEV_CHIP_DIE_PSOC5LP EQU 17 +CYDEV_CHIP_DIE_TMA4 EQU 2 CYDEV_CHIP_DIE_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_PSOC3 EQU 1 CYDEV_CHIP_FAMILY_PSOC4 EQU 2 @@ -2945,23 +3038,26 @@ CYDEV_CHIP_FAMILY_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_USED EQU CYDEV_CHIP_FAMILY_PSOC5 CYDEV_CHIP_JTAG_ID EQU 0x2E133069 CYDEV_CHIP_MEMBER_3A EQU 1 -CYDEV_CHIP_MEMBER_4A EQU 5 -CYDEV_CHIP_MEMBER_4C EQU 9 -CYDEV_CHIP_MEMBER_4D EQU 3 +CYDEV_CHIP_MEMBER_4A EQU 10 +CYDEV_CHIP_MEMBER_4C EQU 15 +CYDEV_CHIP_MEMBER_4D EQU 6 CYDEV_CHIP_MEMBER_4E EQU 4 -CYDEV_CHIP_MEMBER_4F EQU 6 +CYDEV_CHIP_MEMBER_4F EQU 11 CYDEV_CHIP_MEMBER_4G EQU 2 -CYDEV_CHIP_MEMBER_4L EQU 8 -CYDEV_CHIP_MEMBER_4M EQU 7 -CYDEV_CHIP_MEMBER_5A EQU 11 -CYDEV_CHIP_MEMBER_5B EQU 10 +CYDEV_CHIP_MEMBER_4H EQU 9 +CYDEV_CHIP_MEMBER_4I EQU 14 +CYDEV_CHIP_MEMBER_4J EQU 7 +CYDEV_CHIP_MEMBER_4K EQU 8 +CYDEV_CHIP_MEMBER_4L EQU 13 +CYDEV_CHIP_MEMBER_4M EQU 12 +CYDEV_CHIP_MEMBER_4N EQU 5 +CYDEV_CHIP_MEMBER_4U EQU 3 +CYDEV_CHIP_MEMBER_5A EQU 17 +CYDEV_CHIP_MEMBER_5B EQU 16 CYDEV_CHIP_MEMBER_UNKNOWN EQU 0 CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_DIE_ACTUAL EQU CYDEV_CHIP_DIE_EXPECT -CYDEV_CHIP_REV_GEN4_ES EQU 17 -CYDEV_CHIP_REV_GEN4_ES2 EQU 33 -CYDEV_CHIP_REV_GEN4_PRODUCTION EQU 17 CYDEV_CHIP_REV_LEOPARD_ES1 EQU 0 CYDEV_CHIP_REV_LEOPARD_ES2 EQU 1 CYDEV_CHIP_REV_LEOPARD_ES3 EQU 3 @@ -2973,6 +3069,9 @@ CYDEV_CHIP_REV_PSOC4A_ES0 EQU 17 CYDEV_CHIP_REV_PSOC4A_PRODUCTION EQU 17 CYDEV_CHIP_REV_PSOC5LP_ES0 EQU 0 CYDEV_CHIP_REV_PSOC5LP_PRODUCTION EQU 0 +CYDEV_CHIP_REV_TMA4_ES EQU 17 +CYDEV_CHIP_REV_TMA4_ES2 EQU 33 +CYDEV_CHIP_REV_TMA4_PRODUCTION EQU 17 CYDEV_CHIP_REVISION_3A_ES1 EQU 0 CYDEV_CHIP_REVISION_3A_ES2 EQU 1 CYDEV_CHIP_REVISION_3A_ES3 EQU 3 @@ -2983,12 +3082,19 @@ CYDEV_CHIP_REVISION_4C_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4D_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4E_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION_256K EQU 0 CYDEV_CHIP_REVISION_4G_ES EQU 17 CYDEV_CHIP_REVISION_4G_ES2 EQU 33 CYDEV_CHIP_REVISION_4G_PRODUCTION EQU 17 +CYDEV_CHIP_REVISION_4H_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4I_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4J_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4K_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4L_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4N_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4U_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_5A_ES0 EQU 0 CYDEV_CHIP_REVISION_5A_ES1 EQU 1 CYDEV_CHIP_REVISION_5A_PRODUCTION EQU 1 @@ -3021,6 +3127,8 @@ CYDEV_ECC_ENABLE EQU 0 CYDEV_HEAP_SIZE EQU 0x0400 CYDEV_INSTRUCT_CACHE_ENABLED EQU 1 CYDEV_INTR_RISING EQU 0x0000007E +CYDEV_IS_EXPORTING_CODE EQU 0 +CYDEV_IS_IMPORTING_CODE EQU 0 CYDEV_PROJ_TYPE EQU 2 CYDEV_PROJ_TYPE_BOOTLOADER EQU 1 CYDEV_PROJ_TYPE_LAUNCHER EQU 5 diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c index 663bd512..bae2d8f5 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cymetadata.c +* File Name: cymetadata.c * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file defines all extra memory spaces that need to be included. * This file is automatically generated by PSoC Creator. * @@ -28,7 +28,7 @@ __attribute__ ((__section__(".cyloadablemeta"), used)) const uint8 cy_meta_loadable[] = { 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, - 0x00u, 0x00u, 0x00u, 0x00u, 0x5Cu, 0xD1u, 0x40u, 0x04u, + 0x00u, 0x00u, 0x00u, 0x00u, 0x5Cu, 0xD1u, 0x50u, 0x04u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/exported_symbols.txt b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/exported_symbols.txt new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h index ec258fae..3e445731 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: project.h +* File Name: project.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * It contains references to all generated header files and should not be modified. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/renamed_symbols.txt b/software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/renamed_symbols.txt new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx index 672b8ddb..b9e78c08 100644 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx @@ -1,12 +1,12 @@ - - - - - - - + \ No newline at end of file diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit index 830bcd2e..004e661d 100644 Binary files a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit differ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj index 92986c2b..206f4020 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj @@ -130,6 +130,20 @@ + + + + + + + + + + + + + + @@ -280,6 +294,20 @@ + + + + + + + + + + + + + + @@ -3184,6 +3212,24 @@ + + + + + + + + + + + + + + + + + + @@ -3265,7 +3311,6 @@ - @@ -3313,6 +3358,7 @@ + @@ -3320,11 +3366,9 @@ - - - + @@ -3348,6 +3392,7 @@ + @@ -3355,11 +3400,9 @@ - - - + @@ -3383,6 +3426,7 @@ + @@ -3390,11 +3434,9 @@ - - - + @@ -3418,6 +3460,7 @@ + @@ -3425,11 +3468,9 @@ - - - + @@ -3457,6 +3498,7 @@ + @@ -3464,11 +3506,9 @@ - - - + @@ -3492,6 +3532,7 @@ + @@ -3499,11 +3540,9 @@ - - - + @@ -3527,6 +3566,7 @@ + @@ -3534,11 +3574,9 @@ - - - + @@ -3562,6 +3600,7 @@ + @@ -3569,11 +3608,9 @@ - - - + @@ -3581,101 +3618,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3699,6 +3644,7 @@ + @@ -3723,6 +3669,7 @@ + @@ -3747,6 +3694,7 @@ + @@ -3771,6 +3719,7 @@ + @@ -3790,11 +3739,9 @@ - - - - + + @@ -3808,7 +3755,5 @@ - - - + \ No newline at end of file diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd index d942e690..0a10251b 100644 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd @@ -9,7 +9,7 @@ SCSI_Parity_Error No description available - 0x4000646B + 0x40006464 0 0x0 @@ -456,7 +456,7 @@ SCSI_Filtered No description available - 0x4000646A + 0x40006461 0 0x0 @@ -611,7 +611,7 @@ SCSI_Glitch_Ctl No description available - 0x40006474 + 0x4000647A 0 0x0 @@ -632,7 +632,7 @@ SCSI_CTL_PHASE No description available - 0x40006472 + 0x4000647B 0 0x0 @@ -1137,7 +1137,7 @@ SCSI_Out_Ctl No description available - 0x4000647F + 0x40006475 0 0x0 @@ -1158,7 +1158,7 @@ SCSI_Out_Bits No description available - 0x4000647B + 0x40006575 0 0x0 diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch b/software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch index b4a1555a..8583daea 100755 Binary files a/software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch and b/software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch differ diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v b/software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v index 97f07de3..e7f52418 100755 --- a/software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v +++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v @@ -63,7 +63,7 @@ localparam IO_READ = 1'b0; ///////////////////////////////////////////////////////////////////////////// // TX States: // IDLE -// Wait for the SCSI Initiator to be ready +// Wait for an entry in the input FIFO // FIFOLOAD // Load F0 into A0. Feed (old) A0 into the ALU SRCA. // TX @@ -79,27 +79,28 @@ localparam IO_READ = 1'b0; // READY // REQ and DBx output signals will be output in this state // Wait for acknowledgement from the SCSI initiator -// Wait for space in output fifo // RX -// Dummy state for flow control. -// REQ signal will be output in this state -// PI enabled for input into ALU "PASS" operation, storing into F1. +// Wait for the initiator to release he ACK signal. Once released, +// PI enabled for input into ALU "PASS" operation, storing into F1 in the +// next state, either IDLE or FIFOLOAD. // // RX States: // IDLE -// Wait for a dummy "enabling" entry in the input FIFO, -// and for the SCSI Initiator to be ready +// Wait for a dummy "enabling" entry in the input FIFO // FIFOLOAD // Load F0 into A0. // The input FIFO is used to control the number of bytes we attempt to // read from the SCSI bus. +// WAIT_TIL_READY +// Wait for space in output fifo +// // READY // REQ signal will be output in this state // Wait for the initiator to send a byte on the SCSI bus. -// Wait for space in output fifo // RX -// REQ signal will be output in this state -// PI enabled for input into ALU "PASS" operation, storing into F1. +// Wait for the initiator to release he ACK signal. Once released, +// PI enabled for input into ALU "PASS" operation, storing into F1 in the +// next state, either IDLE or FIFOLOAD. localparam STATE_IDLE = 3'b000; @@ -138,11 +139,12 @@ reg parityErrReg; reg[2:0] genParity; reg REQReg; +reg[7:0] dbxInReg; // Set Output Pins assign REQ = REQReg; // STATE_READY & STATE_RX assign DBx_out[7:0] = data; -assign pi[7:0] = ~nDBx_in[7:0]; // Invert active low scsi bus +assign pi[7:0] = dbxInReg[7:0]; assign parityErr = parityErrReg; @@ -163,7 +165,7 @@ wire f0_bus_stat; // Tx FIFO not full wire f0_blk_stat; // Tx FIFO empty wire f1_bus_stat; // Rx FIFO not empty wire f1_blk_stat; // Rx FIFO full -wire txComplete = f0_blk_stat && (state == STATE_IDLE) && nACK; +wire txComplete = f0_blk_stat && (state == STATE_IDLE); cy_psoc3_status #(.cy_force_order(1), .cy_md_select(8'h00)) StatusReg ( .clock(op_clk), @@ -198,17 +200,21 @@ always @(posedge op_clk) begin end STATE_FIFOLOAD: + begin + fifoStore <= 1'b0; + if (!nRST) state <= STATE_IDLE; else if (IO == IO_WRITE) state <= STATE_TX; - // Check that SCSI initiator is ready, and output FIFO is not full. - else if (nACK && !f1_blk_stat) begin + // Check the output FIFO is not full. + else if (!f1_blk_stat) begin state <= STATE_READY; REQReg <= 1'b1; end else begin state <= STATE_WAIT_TIL_READY; end + end STATE_TX: begin @@ -223,19 +229,16 @@ always @(posedge op_clk) begin STATE_DESKEW: if (!nRST) state <= STATE_IDLE; - else if(deskewComplete && nACK) begin + else if(deskewComplete) begin state <= STATE_READY; REQReg <= 1'b1; - end else if (deskewComplete) begin - state <= STATE_WAIT_TIL_READY; end else state <= STATE_DESKEW; - STATE_WAIT_TIL_READY: + STATE_WAIT_TIL_READY: // IO == IO_READ only if (!nRST) state <= STATE_IDLE; - // Check that SCSI initiator is ready, and output FIFO is not full. - // Note that output FIFO is unused in TX mode. - else if (nACK && ((IO == IO_WRITE) || !f1_blk_stat)) begin + // Wait until the output FIFO is not full. + else if (!f1_blk_stat) begin state <= STATE_READY; REQReg <= 1'b1; end else begin @@ -246,7 +249,7 @@ always @(posedge op_clk) begin if (!nRST) state <= STATE_IDLE; else if (~nACK) begin state <= STATE_RX; - fifoStore <= 1'b1; + dbxInReg[7:0] = ~nDBx_in[7:0]; // Invert active low scsi bus genParity[0] <= (~nDBP) ^ 1'b1 ^ ~nDBx_in[7] ^ ~nDBx_in[6]; genParity[1] <= ~nDBx_in[5] ^ ~nDBx_in[4] ^ ~nDBx_in[3]; @@ -255,9 +258,24 @@ always @(posedge op_clk) begin STATE_RX: begin - state <= STATE_IDLE; + // Wait for this transfer to complete. + // We need to wait at the end, because some hosts will set ACK + // before REQ for the first byte of a phase. + if (!nRST) state <= STATE_IDLE; + else if (nACK && !f0_blk_stat) + begin // Next byte is ready, skip IDLE. + fifoStore <= 1'b1; + state <= STATE_FIFOLOAD; + end + else if (nACK) + begin + fifoStore <= 1'b1; + state <= STATE_IDLE; + end + else + state <= STATE_RX; + REQReg <= 1'b0; - fifoStore <= 1'b0; parityErrReg <= 1'b0; data <= 8'b0; if (IO == IO_READ) begin @@ -273,58 +291,58 @@ end // The data output is valid during the DESKEW_INIT phase as well, // so we subtract 1. // SCSI-1 deskew + cable skew = 55ns -// D0 = [0.000000055 / (1 / clk)] - 1 = 2 +// D0 = [0.000000055 / (1 / clk)] - 1 = 1 (clk = 25MHz) // SCSI-2 FAST deskew + cable skew = 25ns -// D0 = [0.000000025 / (1 / clk)] - 1 = 0 -cy_psoc3_dp #(.d0_init(2), +// D0 = [0.000000025 / (1 / clk)] - 1 = 0 (clk = 25MHz) +cy_psoc3_dp #(.d0_init(1), .cy_dpconfig( { `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE, - `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM0: IDLE*/ + `CS_FEEDBACK_ENBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, + `CS_CMP_SEL_CFGA, /*CFGRAM0: IDLE*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC___F0, `CS_A1_SRC_NONE, - `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM1: FIFO Load*/ + `CS_FEEDBACK_ENBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, + `CS_CMP_SEL_CFGA, /*CFGRAM1: FIFO Load*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE, `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM2: TX*/ + `CS_CMP_SEL_CFGA, /*CFGRAM2: TX*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC___D0, `CS_A1_SRC_NONE, `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM3: DESKEW INIT*/ + `CS_CMP_SEL_CFGA, /*CFGRAM3: DESKEW INIT*/ `CS_ALU_OP__DEC, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC__ALU, `CS_A1_SRC_NONE, `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM4: DESKEW*/ + `CS_CMP_SEL_CFGA, /*CFGRAM4: DESKEW*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE, `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM5: WAIT TIL READY*/ + `CS_CMP_SEL_CFGA, /*CFGRAM5: WAIT TIL READY*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE, `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM6: READY*/ + `CS_CMP_SEL_CFGA, /*CFGRAM6: READY*/ `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0, `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE, `CS_FEEDBACK_ENBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA, - `CS_CMP_SEL_CFGA, /*CFGRAM7: RX*/ - 8'hFF, 8'h00, /*CFG9: */ - 8'hFF, 8'hFF, /*CFG11-10: */ + `CS_CMP_SEL_CFGA, /*CFGRAM7: RX*/ + 8'hFF, 8'h00, /*CFG9: */ + 8'hFF, 8'hFF, /*CFG11-10: */ `SC_CMPB_A1_D1, `SC_CMPA_A1_D1, `SC_CI_B_ARITH, `SC_CI_A_ARITH, `SC_C1_MASK_DSBL, `SC_C0_MASK_DSBL, `SC_A_MASK_DSBL, `SC_DEF_SI_0, `SC_SI_B_DEFSI, - `SC_SI_A_DEFSI, /*CFG13-12: */ + `SC_SI_A_DEFSI, /*CFG13-12: */ `SC_A0_SRC_ACC, `SC_SHIFT_SL, `SC_PI_DYN_EN, 1'h0, `SC_FIFO1_ALU, `SC_FIFO0_BUS, `SC_MSB_DSBL, `SC_MSB_BIT0, `SC_MSB_NOCHN, `SC_FB_NOCHN, `SC_CMP1_NOCHN, - `SC_CMP0_NOCHN, /*CFG15-14: */ + `SC_CMP0_NOCHN, /*CFG15-14: */ 10'h00, `SC_FIFO_CLK__DP,`SC_FIFO_CAP_AX, `SC_FIFO_LEVEL,`SC_FIFO__SYNC,`SC_EXTCRC_DSBL, - `SC_WRK16CAT_DSBL /*CFG17-16: */ + `SC_WRK16CAT_DSBL /*CFG17-16: */ } )) datapath( /* input */ .reset(1'b0), @@ -382,3 +400,4 @@ endmodule //`#end` -- edit above this line, do not edit this line + diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c index 194e2529..b0170605 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/Debug_Timer_Interrupt.c @@ -20,6 +20,7 @@ #include #include + #if !defined(Debug_Timer_Interrupt__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void Debug_Timer_Interrupt_Stop(void) *******************************************************************************/ CY_ISR(Debug_Timer_Interrupt_Interrupt) { + #ifdef Debug_Timer_Interrupt_INTERRUPT_INTERRUPT_CALLBACK + Debug_Timer_Interrupt_Interrupt_InterruptCallback(); + #endif /* Debug_Timer_Interrupt_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START Debug_Timer_Interrupt_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c index 6e9249ce..937c9f50 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RST_ISR.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_RST_ISR__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_RST_ISR_Stop(void) *******************************************************************************/ CY_ISR(SCSI_RST_ISR_Interrupt) { + #ifdef SCSI_RST_ISR_INTERRUPT_INTERRUPT_CALLBACK + SCSI_RST_ISR_Interrupt_InterruptCallback(); + #endif /* SCSI_RST_ISR_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_RST_ISR_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c index 6f7af094..99010c68 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_RX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_RX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_RX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SCSI_RX_DMA_COMPLETE_Interrupt) { + #ifdef SCSI_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SCSI_RX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SCSI_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_RX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c index a6404325..2b022a7a 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_SEL_ISR.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_SEL_ISR__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_SEL_ISR_Stop(void) *******************************************************************************/ CY_ISR(SCSI_SEL_ISR_Interrupt) { + #ifdef SCSI_SEL_ISR_INTERRUPT_INTERRUPT_CALLBACK + SCSI_SEL_ISR_Interrupt_InterruptCallback(); + #endif /* SCSI_SEL_ISR_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_SEL_ISR_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c index e5c0507b..2575f060 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SCSI_TX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SCSI_TX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SCSI_TX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SCSI_TX_DMA_COMPLETE_Interrupt) { + #ifdef SCSI_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SCSI_TX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SCSI_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SCSI_TX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SDCard_INT.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SDCard_INT.c index c0726815..a473d5b7 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SDCard_INT.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SDCard_INT.c @@ -18,6 +18,7 @@ #include "SDCard_PVT.h" + /* User code required at start of ISR */ /* `#START SDCard_ISR_START_DEF` */ @@ -54,11 +55,15 @@ CY_ISR(SDCard_TX_ISR) uint8 tmpStatus; #endif /* (SDCard_TX_SOFTWARE_BUF_ENABLED) */ + #ifdef SDCard_TX_ISR_ENTRY_CALLBACK + SDCard_TX_ISR_EntryCallback(); + #endif /* SDCard_TX_ISR_ENTRY_CALLBACK */ + /* User code required at start of ISR */ /* `#START SDCard_TX_ISR_START` */ /* `#END` */ - + #if(SDCard_TX_SOFTWARE_BUF_ENABLED) /* Check if TX data buffer is not empty and there is space in TX FIFO */ while(SDCard_txBufferRead != SDCard_txBufferWrite) @@ -104,6 +109,10 @@ CY_ISR(SDCard_TX_ISR) /* `#START SDCard_TX_ISR_END` */ /* `#END` */ + + #ifdef SDCard_TX_ISR_EXIT_CALLBACK + SDCard_TX_ISR_ExitCallback(); + #endif /* SDCard_TX_ISR_EXIT_CALLBACK */ } @@ -138,11 +147,15 @@ CY_ISR(SDCard_RX_ISR) uint8 rxData; #endif /* (SDCard_RX_SOFTWARE_BUF_ENABLED) */ + #ifdef SDCard_RX_ISR_ENTRY_CALLBACK + SDCard_RX_ISR_EntryCallback(); + #endif /* SDCard_RX_ISR_ENTRY_CALLBACK */ + /* User code required at start of ISR */ /* `#START SDCard_RX_ISR_START` */ /* `#END` */ - + #if(SDCard_RX_SOFTWARE_BUF_ENABLED) tmpStatus = SDCard_GET_STATUS_RX(SDCard_swStatusRx); @@ -184,6 +197,10 @@ CY_ISR(SDCard_RX_ISR) /* `#START SDCard_RX_ISR_END` */ /* `#END` */ + + #ifdef SDCard_RX_ISR_EXIT_CALLBACK + SDCard_RX_ISR_ExitCallback(); + #endif /* SDCard_RX_ISR_EXIT_CALLBACK */ } /* [] END OF FILE */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c index 25651013..0fae9a5b 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_RX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SD_RX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SD_RX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SD_RX_DMA_COMPLETE_Interrupt) { + #ifdef SD_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SD_RX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SD_RX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SD_RX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c index 2d3ee055..d5a43a5f 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/SD_TX_DMA_COMPLETE.c @@ -20,6 +20,7 @@ #include #include + #if !defined(SD_TX_DMA_COMPLETE__REMOVED) /* Check for removal by optimization */ /******************************************************************************* @@ -158,6 +159,10 @@ void SD_TX_DMA_COMPLETE_Stop(void) *******************************************************************************/ CY_ISR(SD_TX_DMA_COMPLETE_Interrupt) { + #ifdef SD_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK + SD_TX_DMA_COMPLETE_Interrupt_InterruptCallback(); + #endif /* SD_TX_DMA_COMPLETE_INTERRUPT_INTERRUPT_CALLBACK */ + /* Place your Interrupt code here. */ /* `#START SD_TX_DMA_COMPLETE_Interrupt` */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c old mode 100644 new mode 100755 index 4c789fec..cb3187bc --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_audio.c @@ -17,6 +17,7 @@ #include "USBFS.h" + #if defined(USBFS_ENABLE_AUDIO_CLASS) #include "USBFS_audio.h" @@ -124,6 +125,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_READ_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_READ_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_READ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_READ_REQUESTS_CALLBACK */ + break; default: break; @@ -142,7 +148,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ - /* Entity ID Control Selector is MUTE */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_MUTE_CONTROL_GET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_MUTE_CONTROL_GET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_MUTE_CONTROL_GET_REQUEST_CALLBACK */ + + /* Entity ID Control Selector is MUTE */ USBFS_currentTD.wCount = 1u; USBFS_currentTD.pData = &USBFS_currentMute; requestHandled = USBFS_InitControlRead(); @@ -153,6 +163,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_GET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_VOLUME_CONTROL_GET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_GET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is VOLUME, */ USBFS_currentTD.wCount = USBFS_VOLUME_LEN; USBFS_currentTD.pData = USBFS_currentVolume; @@ -163,6 +177,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START OTHER_GET_CUR_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_OTHER_GET_CUR_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_OTHER_GET_CUR_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_OTHER_GET_CUR_REQUESTS_CALLBACK */ } break; case USBFS_GET_MIN: /* GET_MIN */ @@ -205,6 +223,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_WRITE_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_WRITE_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_WRITE_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_WRITE_REQUESTS_CALLBACK */ + break; default: break; @@ -237,6 +260,11 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START AUDIO_SAMPLING_FREQ_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_SAMPLING_FREQ_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_SAMPLING_FREQ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_SAMPLING_FREQ_REQUESTS_CALLBACK */ + break; default: break; @@ -255,6 +283,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_MUTE_SET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_MUTE_SET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_MUTE_SET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is MUTE */ USBFS_currentTD.wCount = 1u; USBFS_currentTD.pData = &USBFS_currentMute; @@ -266,6 +298,10 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_SET_REQUEST_CALLBACK + USBFS_DispatchAUDIOClass_VOLUME_CONTROL_SET_REQUEST_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_VOLUME_CONTROL_SET_REQUEST_CALLBACK */ + /* Entity ID Control Selector is VOLUME */ USBFS_currentTD.wCount = USBFS_VOLUME_LEN; USBFS_currentTD.pData = USBFS_currentVolume; @@ -276,12 +312,21 @@ uint8 USBFS_DispatchAUDIOClassRqst(void) /* `#START OTHER_SET_CUR_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_OTHER_SET_CUR_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_OTHER_SET_CUR_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_OTHER_SET_CUR_REQUESTS_CALLBACK */ } #endif /* USBFS_ENABLE_AUDIO_STREAMING */ /* `#START AUDIO_CONTROL_SEL_REQUESTS` Place other request handler here */ /* `#END` */ + + #ifdef USBFS_DISPATCH_AUDIO_CLASS_AUDIO_CONTROL_SEL_REQUESTS_CALLBACK + USBFS_DispatchAUDIOClass_AUDIO_CONTROL_SEL_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_AUDIO_CLASS_AUDIO_CONTROL_SEL_REQUESTS_CALLBACK */ + break; default: break; diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c old mode 100644 new mode 100755 index ae0f7063..be719c93 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cdc.c @@ -23,6 +23,7 @@ #include "USBFS_pvt.h" + /*************************************** * CDC Variables ***************************************/ @@ -104,6 +105,10 @@ uint8 USBFS_DispatchCDCClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CDC_CLASS_CDC_READ_REQUESTS_CALLBACK + USBFS_DispatchCDCClass_CDC_READ_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_CDC_CLASS_CDC_READ_REQUESTS_CALLBACK */ + default: /* requestHandled is initialized as FALSE by default */ break; } @@ -130,6 +135,10 @@ uint8 USBFS_DispatchCDCClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CDC_CLASS_CDC_WRITE_REQUESTS_CALLBACK + USBFS_DispatchCDCClass_CDC_WRITE_REQUESTS_Callback(); + #endif /* USBFS_DISPATCH_CDC_CLASS_CDC_WRITE_REQUESTS_CALLBACK */ + default: /* requestHandled is initialized as FALSE by default */ break; } diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c old mode 100644 new mode 100755 index cc097c17..4e3d8db6 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_cls.c @@ -21,6 +21,7 @@ #include "USBFS_pvt.h" + /*************************************** * User Implemented Class Driver Declarations. ***************************************/ @@ -89,6 +90,10 @@ uint8 USBFS_DispatchClassRqst(void) /* `#END` */ + #ifdef USBFS_DISPATCH_CLASS_RQST_CALLBACK + USBFS_DispatchClassRqst_Callback(); + #endif /* USBFS_DISPATCH_CLASS_RQST_CALLBACK */ + return(requestHandled); } diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c old mode 100644 new mode 100755 index 282c938d..39820f90 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_drv.c @@ -18,6 +18,7 @@ #include "USBFS_pvt.h" + /*************************************** * Global data allocation ***************************************/ @@ -68,7 +69,10 @@ CY_ISR(USBFS_EP_0_ISR) uint8 bRegTemp; uint8 modifyReg; - + #ifdef USBFS_EP_0_ISR_ENTRY_CALLBACK + USBFS_EP_0_ISR_EntryCallback(); + #endif /* USBFS_EP_0_ISR_ENTRY_CALLBACK */ + bRegTemp = CY_GET_REG8(USBFS_EP0_CR_PTR); if ((bRegTemp & USBFS_MODE_ACKD) != 0u) { @@ -128,6 +132,9 @@ CY_ISR(USBFS_EP_0_ISR) } } } + #ifdef USBFS_EP_0_ISR_EXIT_CALLBACK + USBFS_EP_0_ISR_ExitCallback(); + #endif /* USBFS_EP_0_ISR_EXIT_CALLBACK */ } diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c old mode 100644 new mode 100755 index d955c629..2d7dc404 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_episr.c @@ -16,6 +16,7 @@ #include "USBFS.h" #include "USBFS_pvt.h" + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && (USBFS_ENABLE_MIDI_API != 0u)) #include "USBFS_midi.h" #endif /* (defined(USBFS_ENABLE_MIDI_STREAMING) && (USBFS_ENABLE_MIDI_API != 0u)) */ @@ -57,6 +58,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_1_ISR_ENTRY_CALLBACK + USBFS_EP_1_ISR_EntryCallback(); + #endif /* USBFS_EP_1_ISR_ENTRY_CALLBACK */ + /* `#START EP1_USER_CODE` Place your code here */ /* `#END` */ @@ -90,6 +95,10 @@ /* `#END` */ + #ifdef USBFS_EP_1_ISR_EXIT_CALLBACK + USBFS_EP_1_ISR_ExitCallback(); + #endif /* USBFS_EP_1_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -122,6 +131,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_2_ISR_ENTRY_CALLBACK + USBFS_EP_2_ISR_EntryCallback(); + #endif /* USBFS_EP_2_ISR_ENTRY_CALLBACK */ + /* `#START EP2_USER_CODE` Place your code here */ /* `#END` */ @@ -155,6 +168,10 @@ /* `#END` */ + #ifdef USBFS_EP_2_ISR_EXIT_CALLBACK + USBFS_EP_2_ISR_ExitCallback(); + #endif /* USBFS_EP_2_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -187,6 +204,10 @@ uint8 int_en; #endif /* USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3 */ + #ifdef USBFS_EP_3_ISR_ENTRY_CALLBACK + USBFS_EP_3_ISR_EntryCallback(); + #endif /* USBFS_EP_3_ISR_ENTRY_CALLBACK */ + /* `#START EP3_USER_CODE` Place your code here */ /* `#END` */ @@ -220,6 +241,10 @@ /* `#END` */ + #ifdef USBFS_EP_3_ISR_EXIT_CALLBACK + USBFS_EP_3_ISR_ExitCallback(); + #endif /* USBFS_EP_3_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -252,6 +277,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_4_ISR_ENTRY_CALLBACK + USBFS_EP_4_ISR_EntryCallback(); + #endif /* USBFS_EP_4_ISR_ENTRY_CALLBACK */ + /* `#START EP4_USER_CODE` Place your code here */ /* `#END` */ @@ -285,6 +314,10 @@ /* `#END` */ + #ifdef USBFS_EP_4_ISR_EXIT_CALLBACK + USBFS_EP_4_ISR_ExitCallback(); + #endif /* USBFS_EP_4_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -317,6 +350,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_5_ISR_ENTRY_CALLBACK + USBFS_EP_5_ISR_EntryCallback(); + #endif /* USBFS_EP_5_ISR_ENTRY_CALLBACK */ + /* `#START EP5_USER_CODE` Place your code here */ /* `#END` */ @@ -350,6 +387,10 @@ /* `#END` */ + #ifdef USBFS_EP_5_ISR_EXIT_CALLBACK + USBFS_EP_5_ISR_ExitCallback(); + #endif /* USBFS_EP_5_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -381,6 +422,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_6_ISR_ENTRY_CALLBACK + USBFS_EP_6_ISR_EntryCallback(); + #endif /* USBFS_EP_6_ISR_ENTRY_CALLBACK */ + /* `#START EP6_USER_CODE` Place your code here */ /* `#END` */ @@ -414,6 +459,10 @@ /* `#END` */ + #ifdef USBFS_EP_6_ISR_EXIT_CALLBACK + USBFS_EP_6_ISR_ExitCallback(); + #endif /* USBFS_EP_6_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -446,6 +495,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_7_ISR_ENTRY_CALLBACK + USBFS_EP_7_ISR_EntryCallback(); + #endif /* USBFS_EP_7_ISR_ENTRY_CALLBACK */ + /* `#START EP7_USER_CODE` Place your code here */ /* `#END` */ @@ -479,6 +532,10 @@ /* `#END` */ + #ifdef USBFS_EP_7_ISR_EXIT_CALLBACK + USBFS_EP_7_ISR_ExitCallback(); + #endif /* USBFS_EP_7_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -511,6 +568,10 @@ uint8 int_en; #endif /* CY_PSOC3 & USBFS_ISR_SERVICE_MIDI_OUT */ + #ifdef USBFS_EP_8_ISR_ENTRY_CALLBACK + USBFS_EP_8_ISR_EntryCallback(); + #endif /* USBFS_EP_8_ISR_ENTRY_CALLBACK */ + /* `#START EP8_USER_CODE` Place your code here */ /* `#END` */ @@ -544,6 +605,10 @@ /* `#END` */ + #ifdef USBFS_EP_8_ISR_EXIT_CALLBACK + USBFS_EP_8_ISR_ExitCallback(); + #endif /* USBFS_EP_8_ISR_EXIT_CALLBACK */ + #if (defined(USBFS_ENABLE_MIDI_STREAMING) && !defined(USBFS_MAIN_SERVICE_MIDI_OUT) && \ USBFS_ISR_SERVICE_MIDI_OUT && CY_PSOC3) EA = int_en; @@ -569,6 +634,10 @@ *******************************************************************************/ CY_ISR(USBFS_SOF_ISR) { + #ifdef USBFS_SOF_ISR_INTERRUPT_CALLBACK + USBFS_SOF_ISR_InterruptCallback(); + #endif /* USBFS_SOF_ISR_INTERRUPT_CALLBACK */ + /* `#START SOF_USER_CODE` Place your code here */ /* `#END` */ @@ -592,11 +661,19 @@ CY_ISR(USBFS_SOF_ISR) *******************************************************************************/ CY_ISR(USBFS_BUS_RESET_ISR) { + #ifdef USBFS_BUS_RESET_ISR_ENTRY_CALLBACK + USBFS_BUS_RESET_ISR_EntryCallback(); + #endif /* USBFS_BUS_RESET_ISR_ENTRY_CALLBACK */ + /* `#START BUS_RESET_USER_CODE` Place your code here */ /* `#END` */ USBFS_ReInitComponent(); + + #ifdef USBFS_BUS_RESET_ISR_EXIT_CALLBACK + USBFS_BUS_RESET_ISR_ExitCallback(); + #endif /* USBFS_BUS_RESET_ISR_EXIT_CALLBACK */ } @@ -627,6 +704,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) uint8 ep = USBFS_EP1; uint8 ptr = 0u; + #ifdef USBFS_ARB_ISR_ENTRY_CALLBACK + USBFS_ARB_ISR_EntryCallback(); + #endif /* USBFS_ARB_ISR_ENTRY_CALLBACK */ + /* `#START ARB_BEGIN_USER_CODE` Place your code here */ /* `#END` */ @@ -687,6 +768,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#END` */ + #ifdef USBFS_ARB_ISR_CALLBACK + USBFS_ARB_ISR_Callback(); + #endif /* USBFS_ARB_ISR_CALLBACK */ + CY_SET_REG8((reg8 *)(USBFS_ARB_EP1_SR_IND + ptr), ep_status); /* Clear Serviced events */ } ptr += USBFS_EPX_CNTX_ADDR_OFFSET; /* prepare pointer for next EP */ @@ -697,6 +782,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#START ARB_END_USER_CODE` Place your code here */ /* `#END` */ + + #ifdef USBFS_ARB_ISR_EXIT_CALLBACK + USBFS_ARB_ISR_ExitCallback(); + #endif /* USBFS_ARB_ISR_EXIT_CALLBACK */ } #endif /* USBFS_EP_MM */ @@ -724,6 +813,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) uint8 ep = USBFS_EP1; uint8 ptr = 0u; + #ifdef USBFS_EP_DMA_DONE_ISR_ENTRY_CALLBACK + USBFS_EP_DMA_DONE_ISR_EntryCallback(); + #endif /* USBFS_EP_DMA_DONE_ISR_ENTRY_CALLBACK */ + /* `#START EP_DMA_DONE_BEGIN_USER_CODE` Place your code here */ /* `#END` */ @@ -747,6 +840,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#END` */ + #ifdef USBFS_EP_DMA_DONE_ISR_CALLBACK + USBFS_EP_DMA_DONE_ISR_Callback(); + #endif /* USBFS_EP_DMA_DONE_ISR_CALLBACK */ + CY_SET_REG8((reg8 *)(USBFS_ARB_RW1_WA_MSB_IND + ptr), 0x00u); /* repeat 2 last bytes to prefetch endpoint area */ CY_SET_REG8((reg8 *)(USBFS_ARB_RW1_WA_IND + ptr), @@ -773,6 +870,10 @@ CY_ISR(USBFS_BUS_RESET_ISR) /* `#START EP_DMA_DONE_END_USER_CODE` Place your code here */ /* `#END` */ + + #ifdef USBFS_EP_DMA_DONE_ISR_EXIT_CALLBACK + USBFS_EP_DMA_DONE_ISR_ExitCallback(); + #endif /* USBFS_EP_DMA_DONE_ISR_EXIT_CALLBACK */ } #endif /* ((USBFS_EP_MM == USBFS__EP_DMAAUTO) && (USBFS_EP_DMA_AUTO_OPT == 0u)) */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c old mode 100644 new mode 100755 index 99d2875a..20d8ca2b --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_hid.c @@ -25,6 +25,7 @@ #include "USBFS_hid.h" + /*************************************** * HID Variables ***************************************/ @@ -375,6 +376,11 @@ void USBFS_FindReport(void) /* `#START HID_FINDREPORT` Place custom handling here */ /* `#END` */ + + #ifdef USBFS_FIND_REPORT_CALLBACK + USBFS_FindReport_Callback(); + #endif /* USBFS_FIND_REPORT_CALLBACK */ + USBFS_currentTD.count = 0u; /* Init not supported condition */ pTmp = USBFS_GetConfigTablePtr(USBFS_configuration - 1u); reportType = CY_GET_REG8(USBFS_wValueHi); diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c old mode 100644 new mode 100755 index b1092915..e33d0ae4 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_midi.c @@ -26,6 +26,7 @@ #include "USBFS_pvt.h" + /*************************************** * MIDI Constants ***************************************/ @@ -269,6 +270,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START CUSTOM_MIDI_OUT_EP_SERV` Place your code here */ /* `#END` */ + + #ifdef USBFS_MIDI_OUT_EP_SERVICE_CALLBACK + USBFS_MIDI_OUT_EP_Service_Callback(); + #endif /* USBFS_MIDI_OUT_EP_SERVICE_CALLBACK */ } #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_ONE_EXT_INTRF) */ @@ -732,6 +737,9 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI_INIT_CALLBACK + USBFS_MIDI_Init_Callback(); + #endif /* USBFS_MIDI_INIT_CALLBACK */ } @@ -1046,6 +1054,10 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI1_PROCESS_USB_OUT_ENTRY_CALLBACK + USBFS_MIDI1_ProcessUsbOut_EntryCallback(); + #endif /* USBFS_MIDI1_PROCESS_USB_OUT_ENTRY_CALLBACK */ + cmd = epBuf[USBFS_EVENT_BYTE0] & USBFS_CIN_MASK; if((cmd != USBFS_RESERVED0) && (cmd != USBFS_RESERVED1)) { @@ -1118,6 +1130,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START MIDI1_PROCESS_OUT_END` */ /* `#END` */ + + #ifdef USBFS_MIDI1_PROCESS_USB_OUT_EXIT_CALLBACK + USBFS_MIDI1_ProcessUsbOut_ExitCallback(); + #endif /* USBFS_MIDI1_PROCESS_USB_OUT_EXIT_CALLBACK */ } @@ -1269,6 +1285,10 @@ void USBFS_MIDI_EP_Init(void) /* `#END` */ + #ifdef USBFS_MIDI2_PROCESS_USB_OUT_ENTRY_CALLBACK + USBFS_MIDI2_ProcessUsbOut_EntryCallback(); + #endif /* USBFS_MIDI2_PROCESS_USB_OUT_ENTRY_CALLBACK */ + cmd = epBuf[USBFS_EVENT_BYTE0] & USBFS_CIN_MASK; if((cmd != USBFS_RESERVED0) && (cmd != USBFS_RESERVED1)) { @@ -1341,6 +1361,10 @@ void USBFS_MIDI_EP_Init(void) /* `#START MIDI2_PROCESS_OUT_END` */ /* `#END` */ + + #ifdef USBFS_MIDI2_PROCESS_USB_OUT_EXIT_CALLBACK + USBFS_MIDI2_ProcessUsbOut_ExitCallback(); + #endif /* USBFS_MIDI2_PROCESS_USB_OUT_EXIT_CALLBACK */ } #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_TWO_EXT_INTRF) */ #endif /* (USBFS_MIDI_EXT_MODE >= USBFS_ONE_EXT_INTRF) */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c old mode 100644 new mode 100755 index a7ec5d4a..5966bd16 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_pm.c @@ -19,6 +19,7 @@ #include "USBFS_pvt.h" + /*************************************** * Custom Declarations ***************************************/ @@ -53,12 +54,20 @@ static USBFS_BACKUP_STRUCT USBFS_backup; *******************************************************************************/ CY_ISR(USBFS_DP_ISR) { + #ifdef USBFS_DP_ISR_ENTRY_CALLBACK + USBFS_DP_ISR_EntryCallback(); + #endif /* USBFS_DP_ISR_ENTRY_CALLBACK */ + /* `#START DP_USER_CODE` Place your code here */ /* `#END` */ /* Clears active interrupt */ CY_GET_REG8(USBFS_DP_INTSTAT_PTR); + + #ifdef USBFS_DP_ISR_EXIT_CALLBACK + USBFS_DP_ISR_ExitCallback(); + #endif /* USBFS_DP_ISR_EXIT_CALLBACK */ } #endif /* (USBFS_DP_ISR_REMOVE == 0u) */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c old mode 100644 new mode 100755 index e2e06756..82185330 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/USBFS_vnd.c @@ -17,6 +17,7 @@ #include "USBFS.h" #include "USBFS_pvt.h" + #if(USBFS_EXTERN_VND == USBFS_FALSE) @@ -77,6 +78,10 @@ uint8 USBFS_HandleVendorRqst(void) /* `#END` */ + #ifdef USBFS_HANDLE_VENDOR_RQST_CALLBACK + USBFS_HandleVendorRqst_Callback(); + #endif /* USBFS_HANDLE_VENDOR_RQST_CALLBACK */ + return(requestHandled); } @@ -89,7 +94,6 @@ uint8 USBFS_HandleVendorRqst(void) /* `#END` */ - #endif /* USBFS_EXTERN_VND */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c index 9d830a9c..3d48bd53 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cybootloader.c @@ -2,6 +2,7 @@ #include "cytypes.h" +#if (!CYDEV_BOOTLOADER_ENABLE) #if defined(__GNUC__) || defined(__ARMCC_VERSION) __attribute__ ((__section__(".cyloadermeta"), used)) @@ -19,6 +20,8 @@ const uint8 cy_meta_loader[] = { 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}; +#endif /* (!CYDEV_BOOTLOADER_ENABLE) */ + #if defined(__GNUC__) || defined(__ARMCC_VERSION) __attribute__ ((__section__(".cybootloader"), used)) diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareexport.ld b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareexport.ld new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.ld b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.ld new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.scat b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cycodeshareimport.scat new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h index 8164d502..f98fb500 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevice.h +* File Name: cydevice.h * OBSOLETE: Do not use this file. Use the _trm version instead. -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h index b91669dc..02dbced7 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevice_trm.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevice_trm.h +* File Name: cydevice_trm.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc index 72dac869..e550a131 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu.inc @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevicegnu.inc +* File Name: cydevicegnu.inc * OBSOLETE: Do not use this file. Use the _trm version instead. -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc index a81dc5ec..78bb5777 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicegnu_trm.inc @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cydevicegnu_trm.inc +* File Name: cydevicegnu_trm.inc * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides all of the address values for the entire PSoC device. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc index 046a333e..45156fe5 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydeviceiar.inc +; File Name: cydeviceiar.inc ; OBSOLETE: Do not use this file. Use the _trm version instead. -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc index 4ac5f32f..17aba9bd 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydeviceiar_trm.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydeviceiar_trm.inc +; File Name: cydeviceiar_trm.inc ; -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc index f84a9491..67890e89 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydevicerv.inc +; File Name: cydevicerv.inc ; OBSOLETE: Do not use this file. Use the _trm version instead. -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc index a5b5b593..0175ff34 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cydevicerv_trm.inc @@ -1,9 +1,9 @@ ; -; FILENAME: cydevicerv_trm.inc +; File Name: cydevicerv_trm.inc ; -; PSoC Creator 3.2 +; PSoC Creator 3.3 ; -; DESCRIPTION: +; Description: ; This file provides all of the address values for the entire PSoC device. ; ;------------------------------------------------------------------------------- diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h index 77ec5712..69da8132 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h @@ -4,6 +4,7 @@ #include "cydevice_trm.h" /* LED1 */ +#define LED1__0__INTTYPE CYREG_PICU0_INTTYPE1 #define LED1__0__MASK 0x02u #define LED1__0__PC CYREG_PRT0_PC1 #define LED1__0__PORT 0u @@ -19,6 +20,7 @@ #define LED1__DM2 CYREG_PRT0_DM2 #define LED1__DR CYREG_PRT0_DR #define LED1__INP_DIS CYREG_PRT0_INP_DIS +#define LED1__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU0_BASE #define LED1__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define LED1__LCD_EN CYREG_PRT0_LCD_EN #define LED1__MASK 0x02u @@ -36,6 +38,7 @@ #define LED1__SLW CYREG_PRT0_SLW /* SD_CD */ +#define SD_CD__0__INTTYPE CYREG_PICU3_INTTYPE5 #define SD_CD__0__MASK 0x20u #define SD_CD__0__PC CYREG_PRT3_PC5 #define SD_CD__0__PORT 3u @@ -51,6 +54,7 @@ #define SD_CD__DM2 CYREG_PRT3_DM2 #define SD_CD__DR CYREG_PRT3_DR #define SD_CD__INP_DIS CYREG_PRT3_INP_DIS +#define SD_CD__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_CD__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_CD__LCD_EN CYREG_PRT3_LCD_EN #define SD_CD__MASK 0x20u @@ -68,6 +72,7 @@ #define SD_CD__SLW CYREG_PRT3_SLW /* SD_CS */ +#define SD_CS__0__INTTYPE CYREG_PICU3_INTTYPE4 #define SD_CS__0__MASK 0x10u #define SD_CS__0__PC CYREG_PRT3_PC4 #define SD_CS__0__PORT 3u @@ -83,6 +88,7 @@ #define SD_CS__DM2 CYREG_PRT3_DM2 #define SD_CS__DR CYREG_PRT3_DR #define SD_CS__INP_DIS CYREG_PRT3_INP_DIS +#define SD_CS__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_CS__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_CS__LCD_EN CYREG_PRT3_LCD_EN #define SD_CS__MASK 0x10u @@ -120,6 +126,7 @@ #define USBFS_bus_reset__INTC_SET_PD_REG CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +#define USBFS_Dm__0__INTTYPE CYREG_PICU15_INTTYPE7 #define USBFS_Dm__0__MASK 0x80u #define USBFS_Dm__0__PC CYREG_IO_PC_PRT15_7_6_PC1 #define USBFS_Dm__0__PORT 15u @@ -135,6 +142,7 @@ #define USBFS_Dm__DM2 CYREG_PRT15_DM2 #define USBFS_Dm__DR CYREG_PRT15_DR #define USBFS_Dm__INP_DIS CYREG_PRT15_INP_DIS +#define USBFS_Dm__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU15_BASE #define USBFS_Dm__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define USBFS_Dm__LCD_EN CYREG_PRT15_LCD_EN #define USBFS_Dm__MASK 0x80u @@ -152,6 +160,7 @@ #define USBFS_Dm__SLW CYREG_PRT15_SLW /* USBFS_Dp */ +#define USBFS_Dp__0__INTTYPE CYREG_PICU15_INTTYPE6 #define USBFS_Dp__0__MASK 0x40u #define USBFS_Dp__0__PC CYREG_IO_PC_PRT15_7_6_PC0 #define USBFS_Dp__0__PORT 15u @@ -168,6 +177,7 @@ #define USBFS_Dp__DR CYREG_PRT15_DR #define USBFS_Dp__INP_DIS CYREG_PRT15_INP_DIS #define USBFS_Dp__INTSTAT CYREG_PICU15_INTSTAT +#define USBFS_Dp__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU15_BASE #define USBFS_Dp__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define USBFS_Dp__LCD_EN CYREG_PRT15_LCD_EN #define USBFS_Dp__MASK 0x40u @@ -382,6 +392,7 @@ #define USBFS_USB__USBIO_CR1 CYREG_USB_USBIO_CR1 /* EXTLED */ +#define EXTLED__0__INTTYPE CYREG_PICU0_INTTYPE0 #define EXTLED__0__MASK 0x01u #define EXTLED__0__PC CYREG_PRT0_PC0 #define EXTLED__0__PORT 0u @@ -397,6 +408,7 @@ #define EXTLED__DM2 CYREG_PRT0_DM2 #define EXTLED__DR CYREG_PRT0_DR #define EXTLED__INP_DIS CYREG_PRT0_INP_DIS +#define EXTLED__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU0_BASE #define EXTLED__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define EXTLED__LCD_EN CYREG_PRT0_LCD_EN #define EXTLED__MASK 0x01u @@ -414,34 +426,34 @@ #define EXTLED__SLW CYREG_PRT0_SLW /* SDCard_BSPIM */ -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB12_13_ACTL -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB12_13_CTL -#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB12_13_CTL -#define SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB12_13_CTL -#define SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG CYREG_B0_UDB12_13_CTL -#define SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG CYREG_B0_UDB12_13_MSK -#define SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG CYREG_B0_UDB12_13_MSK -#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG CYREG_B0_UDB12_13_MSK -#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB12_13_MSK -#define SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG CYREG_B0_UDB12_ACTL -#define SDCard_BSPIM_BitCounter__CONTROL_REG CYREG_B0_UDB12_CTL -#define SDCard_BSPIM_BitCounter__CONTROL_ST_REG CYREG_B0_UDB12_ST_CTL -#define SDCard_BSPIM_BitCounter__COUNT_REG CYREG_B0_UDB12_CTL -#define SDCard_BSPIM_BitCounter__COUNT_ST_REG CYREG_B0_UDB12_ST_CTL -#define SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL -#define SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL -#define SDCard_BSPIM_BitCounter__PERIOD_REG CYREG_B0_UDB12_MSK -#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB12_13_ACTL -#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG CYREG_B0_UDB12_13_ST -#define SDCard_BSPIM_BitCounter_ST__MASK_REG CYREG_B0_UDB12_MSK -#define SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL -#define SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG CYREG_B0_UDB12_ACTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG CYREG_B0_UDB12_ST_CTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG CYREG_B0_UDB12_ST_CTL -#define SDCard_BSPIM_BitCounter_ST__STATUS_REG CYREG_B0_UDB12_ST -#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG CYREG_B1_UDB07_08_ACTL -#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG CYREG_B1_UDB07_08_ST +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG CYREG_B1_UDB06_07_ACTL +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG CYREG_B1_UDB06_07_CTL +#define SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG CYREG_B1_UDB06_07_CTL +#define SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG CYREG_B1_UDB06_07_CTL +#define SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG CYREG_B1_UDB06_07_CTL +#define SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG CYREG_B1_UDB06_07_MSK +#define SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG CYREG_B1_UDB06_07_MSK +#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG CYREG_B1_UDB06_07_MSK +#define SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG CYREG_B1_UDB06_07_MSK +#define SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG CYREG_B1_UDB06_ACTL +#define SDCard_BSPIM_BitCounter__CONTROL_REG CYREG_B1_UDB06_CTL +#define SDCard_BSPIM_BitCounter__CONTROL_ST_REG CYREG_B1_UDB06_ST_CTL +#define SDCard_BSPIM_BitCounter__COUNT_REG CYREG_B1_UDB06_CTL +#define SDCard_BSPIM_BitCounter__COUNT_ST_REG CYREG_B1_UDB06_ST_CTL +#define SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG CYREG_B1_UDB06_MSK_ACTL +#define SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG CYREG_B1_UDB06_MSK_ACTL +#define SDCard_BSPIM_BitCounter__PERIOD_REG CYREG_B1_UDB06_MSK +#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG CYREG_B1_UDB06_07_ACTL +#define SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG CYREG_B1_UDB06_07_ST +#define SDCard_BSPIM_BitCounter_ST__MASK_REG CYREG_B1_UDB06_MSK +#define SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG CYREG_B1_UDB06_MSK_ACTL +#define SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG CYREG_B1_UDB06_MSK_ACTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG CYREG_B1_UDB06_ACTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG CYREG_B1_UDB06_ST_CTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG CYREG_B1_UDB06_ST_CTL +#define SDCard_BSPIM_BitCounter_ST__STATUS_REG CYREG_B1_UDB06_ST +#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB07_08_ACTL +#define SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG CYREG_B0_UDB07_08_ST #define SDCard_BSPIM_RxStsReg__4__MASK 0x10u #define SDCard_BSPIM_RxStsReg__4__POS 4 #define SDCard_BSPIM_RxStsReg__5__MASK 0x20u @@ -449,13 +461,9 @@ #define SDCard_BSPIM_RxStsReg__6__MASK 0x40u #define SDCard_BSPIM_RxStsReg__6__POS 6 #define SDCard_BSPIM_RxStsReg__MASK 0x70u -#define SDCard_BSPIM_RxStsReg__MASK_REG CYREG_B1_UDB07_MSK -#define SDCard_BSPIM_RxStsReg__MASK_ST_AUX_CTL_REG CYREG_B1_UDB07_MSK_ACTL -#define SDCard_BSPIM_RxStsReg__PER_ST_AUX_CTL_REG CYREG_B1_UDB07_MSK_ACTL -#define SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG CYREG_B1_UDB07_ACTL -#define SDCard_BSPIM_RxStsReg__STATUS_CNT_REG CYREG_B1_UDB07_ST_CTL -#define SDCard_BSPIM_RxStsReg__STATUS_CONTROL_REG CYREG_B1_UDB07_ST_CTL -#define SDCard_BSPIM_RxStsReg__STATUS_REG CYREG_B1_UDB07_ST +#define SDCard_BSPIM_RxStsReg__MASK_REG CYREG_B0_UDB07_MSK +#define SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG CYREG_B0_UDB07_ACTL +#define SDCard_BSPIM_RxStsReg__STATUS_REG CYREG_B0_UDB07_ST #define SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG CYREG_B1_UDB04_05_A0 #define SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG CYREG_B1_UDB04_05_A1 #define SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG CYREG_B1_UDB04_05_D0 @@ -473,12 +481,12 @@ #define SDCard_BSPIM_sR8_Dp_u0__F0_F1_REG CYREG_B1_UDB04_F0_F1 #define SDCard_BSPIM_sR8_Dp_u0__F0_REG CYREG_B1_UDB04_F0 #define SDCard_BSPIM_sR8_Dp_u0__F1_REG CYREG_B1_UDB04_F1 -#define SDCard_BSPIM_sR8_Dp_u0__MSK_DP_AUX_CTL_REG CYREG_B1_UDB04_MSK_ACTL -#define SDCard_BSPIM_sR8_Dp_u0__PER_DP_AUX_CTL_REG CYREG_B1_UDB04_MSK_ACTL #define SDCard_BSPIM_TxStsReg__0__MASK 0x01u #define SDCard_BSPIM_TxStsReg__0__POS 0 #define SDCard_BSPIM_TxStsReg__1__MASK 0x02u #define SDCard_BSPIM_TxStsReg__1__POS 1 +#define SDCard_BSPIM_TxStsReg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB04_05_ACTL +#define SDCard_BSPIM_TxStsReg__16BIT_STATUS_REG CYREG_B0_UDB04_05_ST #define SDCard_BSPIM_TxStsReg__2__MASK 0x04u #define SDCard_BSPIM_TxStsReg__2__POS 2 #define SDCard_BSPIM_TxStsReg__3__MASK 0x08u @@ -486,11 +494,12 @@ #define SDCard_BSPIM_TxStsReg__4__MASK 0x10u #define SDCard_BSPIM_TxStsReg__4__POS 4 #define SDCard_BSPIM_TxStsReg__MASK 0x1Fu -#define SDCard_BSPIM_TxStsReg__MASK_REG CYREG_B1_UDB11_MSK -#define SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG CYREG_B1_UDB11_ACTL -#define SDCard_BSPIM_TxStsReg__STATUS_REG CYREG_B1_UDB11_ST +#define SDCard_BSPIM_TxStsReg__MASK_REG CYREG_B0_UDB04_MSK +#define SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG CYREG_B0_UDB04_ACTL +#define SDCard_BSPIM_TxStsReg__STATUS_REG CYREG_B0_UDB04_ST /* SD_SCK */ +#define SD_SCK__0__INTTYPE CYREG_PICU3_INTTYPE2 #define SD_SCK__0__MASK 0x04u #define SD_SCK__0__PC CYREG_PRT3_PC2 #define SD_SCK__0__PORT 3u @@ -506,6 +515,7 @@ #define SD_SCK__DM2 CYREG_PRT3_DM2 #define SD_SCK__DR CYREG_PRT3_DR #define SD_SCK__INP_DIS CYREG_PRT3_INP_DIS +#define SD_SCK__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_SCK__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_SCK__LCD_EN CYREG_PRT3_LCD_EN #define SD_SCK__MASK 0x04u @@ -534,6 +544,7 @@ #define SCSI_In__0__DM2 CYREG_PRT2_DM2 #define SCSI_In__0__DR CYREG_PRT2_DR #define SCSI_In__0__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In__0__INTTYPE CYREG_PICU2_INTTYPE1 #define SCSI_In__0__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In__0__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In__0__MASK 0x02u @@ -561,6 +572,7 @@ #define SCSI_In__1__DM2 CYREG_PRT4_DM2 #define SCSI_In__1__DR CYREG_PRT4_DR #define SCSI_In__1__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_In__1__INTTYPE CYREG_PICU4_INTTYPE6 #define SCSI_In__1__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_In__1__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_In__1__MASK 0x40u @@ -588,6 +600,7 @@ #define SCSI_In__2__DM2 CYREG_PRT4_DM2 #define SCSI_In__2__DR CYREG_PRT4_DR #define SCSI_In__2__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_In__2__INTTYPE CYREG_PICU4_INTTYPE2 #define SCSI_In__2__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_In__2__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_In__2__MASK 0x04u @@ -615,6 +628,7 @@ #define SCSI_In__3__DM2 CYREG_PRT0_DM2 #define SCSI_In__3__DR CYREG_PRT0_DR #define SCSI_In__3__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_In__3__INTTYPE CYREG_PICU0_INTTYPE5 #define SCSI_In__3__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_In__3__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_In__3__MASK 0x20u @@ -642,6 +656,7 @@ #define SCSI_In__4__DM2 CYREG_PRT0_DM2 #define SCSI_In__4__DR CYREG_PRT0_DR #define SCSI_In__4__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_In__4__INTTYPE CYREG_PICU0_INTTYPE4 #define SCSI_In__4__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_In__4__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_In__4__MASK 0x10u @@ -669,6 +684,7 @@ #define SCSI_In__CD__DM2 CYREG_PRT4_DM2 #define SCSI_In__CD__DR CYREG_PRT4_DR #define SCSI_In__CD__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_In__CD__INTTYPE CYREG_PICU4_INTTYPE2 #define SCSI_In__CD__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_In__CD__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_In__CD__MASK 0x04u @@ -696,6 +712,7 @@ #define SCSI_In__DBP__DM2 CYREG_PRT2_DM2 #define SCSI_In__DBP__DR CYREG_PRT2_DR #define SCSI_In__DBP__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In__DBP__INTTYPE CYREG_PICU2_INTTYPE1 #define SCSI_In__DBP__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In__DBP__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In__DBP__MASK 0x02u @@ -723,6 +740,7 @@ #define SCSI_In__IO__DM2 CYREG_PRT0_DM2 #define SCSI_In__IO__DR CYREG_PRT0_DR #define SCSI_In__IO__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_In__IO__INTTYPE CYREG_PICU0_INTTYPE4 #define SCSI_In__IO__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_In__IO__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_In__IO__MASK 0x10u @@ -750,6 +768,7 @@ #define SCSI_In__MSG__DM2 CYREG_PRT4_DM2 #define SCSI_In__MSG__DR CYREG_PRT4_DR #define SCSI_In__MSG__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_In__MSG__INTTYPE CYREG_PICU4_INTTYPE6 #define SCSI_In__MSG__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_In__MSG__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_In__MSG__MASK 0x40u @@ -777,6 +796,7 @@ #define SCSI_In__REQ__DM2 CYREG_PRT0_DM2 #define SCSI_In__REQ__DR CYREG_PRT0_DR #define SCSI_In__REQ__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_In__REQ__INTTYPE CYREG_PICU0_INTTYPE5 #define SCSI_In__REQ__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_In__REQ__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_In__REQ__MASK 0x20u @@ -806,6 +826,7 @@ #define SCSI_In_DBx__0__DM2 CYREG_PRT5_DM2 #define SCSI_In_DBx__0__DR CYREG_PRT5_DR #define SCSI_In_DBx__0__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In_DBx__0__INTTYPE CYREG_PICU5_INTTYPE3 #define SCSI_In_DBx__0__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In_DBx__0__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In_DBx__0__MASK 0x08u @@ -833,6 +854,7 @@ #define SCSI_In_DBx__1__DM2 CYREG_PRT5_DM2 #define SCSI_In_DBx__1__DR CYREG_PRT5_DR #define SCSI_In_DBx__1__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In_DBx__1__INTTYPE CYREG_PICU5_INTTYPE2 #define SCSI_In_DBx__1__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In_DBx__1__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In_DBx__1__MASK 0x04u @@ -860,6 +882,7 @@ #define SCSI_In_DBx__2__DM2 CYREG_PRT6_DM2 #define SCSI_In_DBx__2__DR CYREG_PRT6_DR #define SCSI_In_DBx__2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In_DBx__2__INTTYPE CYREG_PICU6_INTTYPE7 #define SCSI_In_DBx__2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In_DBx__2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In_DBx__2__MASK 0x80u @@ -887,6 +910,7 @@ #define SCSI_In_DBx__3__DM2 CYREG_PRT6_DM2 #define SCSI_In_DBx__3__DR CYREG_PRT6_DR #define SCSI_In_DBx__3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In_DBx__3__INTTYPE CYREG_PICU6_INTTYPE6 #define SCSI_In_DBx__3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In_DBx__3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In_DBx__3__MASK 0x40u @@ -912,6 +936,7 @@ #define SCSI_In_DBx__4__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__4__DR CYREG_PRT12_DR #define SCSI_In_DBx__4__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__4__INTTYPE CYREG_PICU12_INTTYPE5 #define SCSI_In_DBx__4__MASK 0x20u #define SCSI_In_DBx__4__PC CYREG_PRT12_PC5 #define SCSI_In_DBx__4__PORT 12u @@ -938,6 +963,7 @@ #define SCSI_In_DBx__5__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__5__DR CYREG_PRT12_DR #define SCSI_In_DBx__5__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__5__INTTYPE CYREG_PICU12_INTTYPE4 #define SCSI_In_DBx__5__MASK 0x10u #define SCSI_In_DBx__5__PC CYREG_PRT12_PC4 #define SCSI_In_DBx__5__PORT 12u @@ -966,6 +992,7 @@ #define SCSI_In_DBx__6__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__6__DR CYREG_PRT2_DR #define SCSI_In_DBx__6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__6__INTTYPE CYREG_PICU2_INTTYPE5 #define SCSI_In_DBx__6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__6__MASK 0x20u @@ -993,6 +1020,7 @@ #define SCSI_In_DBx__7__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__7__DR CYREG_PRT2_DR #define SCSI_In_DBx__7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__7__INTTYPE CYREG_PICU2_INTTYPE4 #define SCSI_In_DBx__7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__7__MASK 0x10u @@ -1020,6 +1048,7 @@ #define SCSI_In_DBx__DB0__DM2 CYREG_PRT5_DM2 #define SCSI_In_DBx__DB0__DR CYREG_PRT5_DR #define SCSI_In_DBx__DB0__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In_DBx__DB0__INTTYPE CYREG_PICU5_INTTYPE3 #define SCSI_In_DBx__DB0__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In_DBx__DB0__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In_DBx__DB0__MASK 0x08u @@ -1047,6 +1076,7 @@ #define SCSI_In_DBx__DB1__DM2 CYREG_PRT5_DM2 #define SCSI_In_DBx__DB1__DR CYREG_PRT5_DR #define SCSI_In_DBx__DB1__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_In_DBx__DB1__INTTYPE CYREG_PICU5_INTTYPE2 #define SCSI_In_DBx__DB1__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_In_DBx__DB1__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_In_DBx__DB1__MASK 0x04u @@ -1074,6 +1104,7 @@ #define SCSI_In_DBx__DB2__DM2 CYREG_PRT6_DM2 #define SCSI_In_DBx__DB2__DR CYREG_PRT6_DR #define SCSI_In_DBx__DB2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In_DBx__DB2__INTTYPE CYREG_PICU6_INTTYPE7 #define SCSI_In_DBx__DB2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In_DBx__DB2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In_DBx__DB2__MASK 0x80u @@ -1101,6 +1132,7 @@ #define SCSI_In_DBx__DB3__DM2 CYREG_PRT6_DM2 #define SCSI_In_DBx__DB3__DR CYREG_PRT6_DR #define SCSI_In_DBx__DB3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_In_DBx__DB3__INTTYPE CYREG_PICU6_INTTYPE6 #define SCSI_In_DBx__DB3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_In_DBx__DB3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_In_DBx__DB3__MASK 0x40u @@ -1126,6 +1158,7 @@ #define SCSI_In_DBx__DB4__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__DB4__DR CYREG_PRT12_DR #define SCSI_In_DBx__DB4__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__DB4__INTTYPE CYREG_PICU12_INTTYPE5 #define SCSI_In_DBx__DB4__MASK 0x20u #define SCSI_In_DBx__DB4__PC CYREG_PRT12_PC5 #define SCSI_In_DBx__DB4__PORT 12u @@ -1152,6 +1185,7 @@ #define SCSI_In_DBx__DB5__DM2 CYREG_PRT12_DM2 #define SCSI_In_DBx__DB5__DR CYREG_PRT12_DR #define SCSI_In_DBx__DB5__INP_DIS CYREG_PRT12_INP_DIS +#define SCSI_In_DBx__DB5__INTTYPE CYREG_PICU12_INTTYPE4 #define SCSI_In_DBx__DB5__MASK 0x10u #define SCSI_In_DBx__DB5__PC CYREG_PRT12_PC4 #define SCSI_In_DBx__DB5__PORT 12u @@ -1180,6 +1214,7 @@ #define SCSI_In_DBx__DB6__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB6__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB6__INTTYPE CYREG_PICU2_INTTYPE5 #define SCSI_In_DBx__DB6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB6__MASK 0x20u @@ -1207,6 +1242,7 @@ #define SCSI_In_DBx__DB7__DM2 CYREG_PRT2_DM2 #define SCSI_In_DBx__DB7__DR CYREG_PRT2_DR #define SCSI_In_DBx__DB7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_In_DBx__DB7__INTTYPE CYREG_PICU2_INTTYPE4 #define SCSI_In_DBx__DB7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_In_DBx__DB7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_In_DBx__DB7__MASK 0x10u @@ -1225,6 +1261,7 @@ #define SCSI_In_DBx__DB7__SLW CYREG_PRT2_SLW /* SD_MISO */ +#define SD_MISO__0__INTTYPE CYREG_PICU3_INTTYPE1 #define SD_MISO__0__MASK 0x02u #define SD_MISO__0__PC CYREG_PRT3_PC1 #define SD_MISO__0__PORT 3u @@ -1240,6 +1277,7 @@ #define SD_MISO__DM2 CYREG_PRT3_DM2 #define SD_MISO__DR CYREG_PRT3_DR #define SD_MISO__INP_DIS CYREG_PRT3_INP_DIS +#define SD_MISO__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_MISO__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_MISO__LCD_EN CYREG_PRT3_LCD_EN #define SD_MISO__MASK 0x02u @@ -1257,6 +1295,7 @@ #define SD_MISO__SLW CYREG_PRT3_SLW /* SD_MOSI */ +#define SD_MOSI__0__INTTYPE CYREG_PICU3_INTTYPE3 #define SD_MOSI__0__MASK 0x08u #define SD_MOSI__0__PC CYREG_PRT3_PC3 #define SD_MOSI__0__PORT 3u @@ -1272,6 +1311,7 @@ #define SD_MOSI__DM2 CYREG_PRT3_DM2 #define SD_MOSI__DR CYREG_PRT3_DR #define SD_MOSI__INP_DIS CYREG_PRT3_INP_DIS +#define SD_MOSI__INTTYPE_BASE CYDEV_PICU_INTTYPE_PICU3_BASE #define SD_MOSI__LCD_COM_SEG CYREG_PRT3_LCD_COM_SEG #define SD_MOSI__LCD_EN CYREG_PRT3_LCD_EN #define SD_MOSI__MASK 0x08u @@ -1311,6 +1351,7 @@ #define SCSI_Out__0__DM2 CYREG_PRT15_DM2 #define SCSI_Out__0__DR CYREG_PRT15_DR #define SCSI_Out__0__INP_DIS CYREG_PRT15_INP_DIS +#define SCSI_Out__0__INTTYPE CYREG_PICU15_INTTYPE5 #define SCSI_Out__0__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define SCSI_Out__0__LCD_EN CYREG_PRT15_LCD_EN #define SCSI_Out__0__MASK 0x20u @@ -1338,6 +1379,7 @@ #define SCSI_Out__1__DM2 CYREG_PRT15_DM2 #define SCSI_Out__1__DR CYREG_PRT15_DR #define SCSI_Out__1__INP_DIS CYREG_PRT15_INP_DIS +#define SCSI_Out__1__INTTYPE CYREG_PICU15_INTTYPE4 #define SCSI_Out__1__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define SCSI_Out__1__LCD_EN CYREG_PRT15_LCD_EN #define SCSI_Out__1__MASK 0x10u @@ -1365,6 +1407,7 @@ #define SCSI_Out__2__DM2 CYREG_PRT6_DM2 #define SCSI_Out__2__DR CYREG_PRT6_DR #define SCSI_Out__2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out__2__INTTYPE CYREG_PICU6_INTTYPE1 #define SCSI_Out__2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out__2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out__2__MASK 0x02u @@ -1392,6 +1435,7 @@ #define SCSI_Out__3__DM2 CYREG_PRT6_DM2 #define SCSI_Out__3__DR CYREG_PRT6_DR #define SCSI_Out__3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out__3__INTTYPE CYREG_PICU6_INTTYPE0 #define SCSI_Out__3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out__3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out__3__MASK 0x01u @@ -1419,6 +1463,7 @@ #define SCSI_Out__4__DM2 CYREG_PRT4_DM2 #define SCSI_Out__4__DR CYREG_PRT4_DR #define SCSI_Out__4__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__4__INTTYPE CYREG_PICU4_INTTYPE5 #define SCSI_Out__4__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__4__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__4__MASK 0x20u @@ -1446,6 +1491,7 @@ #define SCSI_Out__5__DM2 CYREG_PRT4_DM2 #define SCSI_Out__5__DR CYREG_PRT4_DR #define SCSI_Out__5__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__5__INTTYPE CYREG_PICU4_INTTYPE4 #define SCSI_Out__5__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__5__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__5__MASK 0x10u @@ -1473,6 +1519,7 @@ #define SCSI_Out__6__DM2 CYREG_PRT0_DM2 #define SCSI_Out__6__DR CYREG_PRT0_DR #define SCSI_Out__6__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__6__INTTYPE CYREG_PICU0_INTTYPE7 #define SCSI_Out__6__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__6__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__6__MASK 0x80u @@ -1500,6 +1547,7 @@ #define SCSI_Out__7__DM2 CYREG_PRT0_DM2 #define SCSI_Out__7__DR CYREG_PRT0_DR #define SCSI_Out__7__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__7__INTTYPE CYREG_PICU0_INTTYPE6 #define SCSI_Out__7__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__7__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__7__MASK 0x40u @@ -1527,6 +1575,7 @@ #define SCSI_Out__8__DM2 CYREG_PRT0_DM2 #define SCSI_Out__8__DR CYREG_PRT0_DR #define SCSI_Out__8__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__8__INTTYPE CYREG_PICU0_INTTYPE3 #define SCSI_Out__8__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__8__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__8__MASK 0x08u @@ -1554,6 +1603,7 @@ #define SCSI_Out__9__DM2 CYREG_PRT0_DM2 #define SCSI_Out__9__DR CYREG_PRT0_DR #define SCSI_Out__9__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__9__INTTYPE CYREG_PICU0_INTTYPE2 #define SCSI_Out__9__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__9__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__9__MASK 0x04u @@ -1581,6 +1631,7 @@ #define SCSI_Out__ACK__DM2 CYREG_PRT6_DM2 #define SCSI_Out__ACK__DR CYREG_PRT6_DR #define SCSI_Out__ACK__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out__ACK__INTTYPE CYREG_PICU6_INTTYPE0 #define SCSI_Out__ACK__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out__ACK__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out__ACK__MASK 0x01u @@ -1608,6 +1659,7 @@ #define SCSI_Out__ATN__DM2 CYREG_PRT15_DM2 #define SCSI_Out__ATN__DR CYREG_PRT15_DR #define SCSI_Out__ATN__INP_DIS CYREG_PRT15_INP_DIS +#define SCSI_Out__ATN__INTTYPE CYREG_PICU15_INTTYPE4 #define SCSI_Out__ATN__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define SCSI_Out__ATN__LCD_EN CYREG_PRT15_LCD_EN #define SCSI_Out__ATN__MASK 0x10u @@ -1635,6 +1687,7 @@ #define SCSI_Out__BSY__DM2 CYREG_PRT6_DM2 #define SCSI_Out__BSY__DR CYREG_PRT6_DR #define SCSI_Out__BSY__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out__BSY__INTTYPE CYREG_PICU6_INTTYPE1 #define SCSI_Out__BSY__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out__BSY__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out__BSY__MASK 0x02u @@ -1662,6 +1715,7 @@ #define SCSI_Out__CD_raw__DM2 CYREG_PRT0_DM2 #define SCSI_Out__CD_raw__DR CYREG_PRT0_DR #define SCSI_Out__CD_raw__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__CD_raw__INTTYPE CYREG_PICU0_INTTYPE6 #define SCSI_Out__CD_raw__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__CD_raw__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__CD_raw__MASK 0x40u @@ -1689,6 +1743,7 @@ #define SCSI_Out__DBP_raw__DM2 CYREG_PRT15_DM2 #define SCSI_Out__DBP_raw__DR CYREG_PRT15_DR #define SCSI_Out__DBP_raw__INP_DIS CYREG_PRT15_INP_DIS +#define SCSI_Out__DBP_raw__INTTYPE CYREG_PICU15_INTTYPE5 #define SCSI_Out__DBP_raw__LCD_COM_SEG CYREG_PRT15_LCD_COM_SEG #define SCSI_Out__DBP_raw__LCD_EN CYREG_PRT15_LCD_EN #define SCSI_Out__DBP_raw__MASK 0x20u @@ -1716,6 +1771,7 @@ #define SCSI_Out__IO_raw__DM2 CYREG_PRT0_DM2 #define SCSI_Out__IO_raw__DR CYREG_PRT0_DR #define SCSI_Out__IO_raw__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__IO_raw__INTTYPE CYREG_PICU0_INTTYPE2 #define SCSI_Out__IO_raw__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__IO_raw__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__IO_raw__MASK 0x04u @@ -1743,6 +1799,7 @@ #define SCSI_Out__MSG_raw__DM2 CYREG_PRT4_DM2 #define SCSI_Out__MSG_raw__DR CYREG_PRT4_DR #define SCSI_Out__MSG_raw__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__MSG_raw__INTTYPE CYREG_PICU4_INTTYPE4 #define SCSI_Out__MSG_raw__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__MSG_raw__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__MSG_raw__MASK 0x10u @@ -1770,6 +1827,7 @@ #define SCSI_Out__REQ__DM2 CYREG_PRT0_DM2 #define SCSI_Out__REQ__DR CYREG_PRT0_DR #define SCSI_Out__REQ__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__REQ__INTTYPE CYREG_PICU0_INTTYPE3 #define SCSI_Out__REQ__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__REQ__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__REQ__MASK 0x08u @@ -1797,6 +1855,7 @@ #define SCSI_Out__RST__DM2 CYREG_PRT4_DM2 #define SCSI_Out__RST__DR CYREG_PRT4_DR #define SCSI_Out__RST__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Out__RST__INTTYPE CYREG_PICU4_INTTYPE5 #define SCSI_Out__RST__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Out__RST__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Out__RST__MASK 0x20u @@ -1824,6 +1883,7 @@ #define SCSI_Out__SEL__DM2 CYREG_PRT0_DM2 #define SCSI_Out__SEL__DR CYREG_PRT0_DR #define SCSI_Out__SEL__INP_DIS CYREG_PRT0_INP_DIS +#define SCSI_Out__SEL__INTTYPE CYREG_PICU0_INTTYPE7 #define SCSI_Out__SEL__LCD_COM_SEG CYREG_PRT0_LCD_COM_SEG #define SCSI_Out__SEL__LCD_EN CYREG_PRT0_LCD_EN #define SCSI_Out__SEL__MASK 0x80u @@ -1846,15 +1906,15 @@ #define SCSI_Out_Bits_Sync_ctrl_reg__0__POS 0 #define SCSI_Out_Bits_Sync_ctrl_reg__1__MASK 0x02u #define SCSI_Out_Bits_Sync_ctrl_reg__1__POS 1 -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B1_UDB07_08_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B1_UDB07_08_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B1_UDB07_08_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B1_UDB07_08_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B1_UDB07_08_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B1_UDB07_08_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B1_UDB07_08_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B1_UDB07_08_MSK -#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B1_UDB07_08_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB02_03_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB02_03_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB02_03_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB02_03_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB02_03_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB02_03_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB02_03_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB02_03_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB02_03_MSK #define SCSI_Out_Bits_Sync_ctrl_reg__2__MASK 0x04u #define SCSI_Out_Bits_Sync_ctrl_reg__2__POS 2 #define SCSI_Out_Bits_Sync_ctrl_reg__3__MASK 0x08u @@ -1867,37 +1927,37 @@ #define SCSI_Out_Bits_Sync_ctrl_reg__6__POS 6 #define SCSI_Out_Bits_Sync_ctrl_reg__7__MASK 0x80u #define SCSI_Out_Bits_Sync_ctrl_reg__7__POS 7 -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B1_UDB07_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG CYREG_B1_UDB07_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B1_UDB07_ST_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG CYREG_B1_UDB07_CTL -#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG CYREG_B1_UDB07_ST_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB02_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB02_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB02_ST_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB02_CTL +#define SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB02_ST_CTL #define SCSI_Out_Bits_Sync_ctrl_reg__MASK 0xFFu -#define SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B1_UDB07_MSK_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B1_UDB07_MSK_ACTL -#define SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG CYREG_B1_UDB07_MSK +#define SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL +#define SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB02_MSK /* SCSI_Out_Ctl */ #define SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_Out_Ctl_Sync_ctrl_reg__0__POS 0 -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B1_UDB04_05_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B1_UDB04_05_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B1_UDB04_05_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B1_UDB04_05_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B1_UDB04_05_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B1_UDB04_05_MSK -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B1_UDB04_05_MSK -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B1_UDB04_05_MSK -#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B1_UDB04_05_MSK -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B1_UDB04_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B1_UDB04_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B1_UDB04_ST_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B1_UDB04_CTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B1_UDB04_ST_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB01_02_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB01_02_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB01_02_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB01_02_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB01_02_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB01_02_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB01_02_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB01_02_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB01_02_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB01_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB01_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB01_ST_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB01_CTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB01_ST_CTL #define SCSI_Out_Ctl_Sync_ctrl_reg__MASK 0x01u -#define SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B1_UDB04_MSK_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B1_UDB04_MSK_ACTL -#define SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B1_UDB04_MSK +#define SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB01_MSK_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB01_MSK_ACTL +#define SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB01_MSK /* SCSI_Out_DBx */ #define SCSI_Out_DBx__0__AG CYREG_PRT5_AG @@ -1911,6 +1971,7 @@ #define SCSI_Out_DBx__0__DM2 CYREG_PRT5_DM2 #define SCSI_Out_DBx__0__DR CYREG_PRT5_DR #define SCSI_Out_DBx__0__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Out_DBx__0__INTTYPE CYREG_PICU5_INTTYPE1 #define SCSI_Out_DBx__0__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Out_DBx__0__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Out_DBx__0__MASK 0x02u @@ -1938,6 +1999,7 @@ #define SCSI_Out_DBx__1__DM2 CYREG_PRT5_DM2 #define SCSI_Out_DBx__1__DR CYREG_PRT5_DR #define SCSI_Out_DBx__1__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Out_DBx__1__INTTYPE CYREG_PICU5_INTTYPE0 #define SCSI_Out_DBx__1__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Out_DBx__1__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Out_DBx__1__MASK 0x01u @@ -1965,6 +2027,7 @@ #define SCSI_Out_DBx__2__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__2__DR CYREG_PRT6_DR #define SCSI_Out_DBx__2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__2__INTTYPE CYREG_PICU6_INTTYPE5 #define SCSI_Out_DBx__2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__2__MASK 0x20u @@ -1992,6 +2055,7 @@ #define SCSI_Out_DBx__3__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__3__DR CYREG_PRT6_DR #define SCSI_Out_DBx__3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__3__INTTYPE CYREG_PICU6_INTTYPE4 #define SCSI_Out_DBx__3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__3__MASK 0x10u @@ -2019,6 +2083,7 @@ #define SCSI_Out_DBx__4__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__4__DR CYREG_PRT2_DR #define SCSI_Out_DBx__4__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__4__INTTYPE CYREG_PICU2_INTTYPE7 #define SCSI_Out_DBx__4__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__4__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__4__MASK 0x80u @@ -2046,6 +2111,7 @@ #define SCSI_Out_DBx__5__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__5__DR CYREG_PRT2_DR #define SCSI_Out_DBx__5__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__5__INTTYPE CYREG_PICU2_INTTYPE6 #define SCSI_Out_DBx__5__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__5__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__5__MASK 0x40u @@ -2073,6 +2139,7 @@ #define SCSI_Out_DBx__6__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__6__DR CYREG_PRT2_DR #define SCSI_Out_DBx__6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__6__INTTYPE CYREG_PICU2_INTTYPE3 #define SCSI_Out_DBx__6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__6__MASK 0x08u @@ -2100,6 +2167,7 @@ #define SCSI_Out_DBx__7__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__7__DR CYREG_PRT2_DR #define SCSI_Out_DBx__7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__7__INTTYPE CYREG_PICU2_INTTYPE2 #define SCSI_Out_DBx__7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__7__MASK 0x04u @@ -2127,6 +2195,7 @@ #define SCSI_Out_DBx__DB0__DM2 CYREG_PRT5_DM2 #define SCSI_Out_DBx__DB0__DR CYREG_PRT5_DR #define SCSI_Out_DBx__DB0__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Out_DBx__DB0__INTTYPE CYREG_PICU5_INTTYPE1 #define SCSI_Out_DBx__DB0__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Out_DBx__DB0__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Out_DBx__DB0__MASK 0x02u @@ -2154,6 +2223,7 @@ #define SCSI_Out_DBx__DB1__DM2 CYREG_PRT5_DM2 #define SCSI_Out_DBx__DB1__DR CYREG_PRT5_DR #define SCSI_Out_DBx__DB1__INP_DIS CYREG_PRT5_INP_DIS +#define SCSI_Out_DBx__DB1__INTTYPE CYREG_PICU5_INTTYPE0 #define SCSI_Out_DBx__DB1__LCD_COM_SEG CYREG_PRT5_LCD_COM_SEG #define SCSI_Out_DBx__DB1__LCD_EN CYREG_PRT5_LCD_EN #define SCSI_Out_DBx__DB1__MASK 0x01u @@ -2181,6 +2251,7 @@ #define SCSI_Out_DBx__DB2__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB2__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB2__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB2__INTTYPE CYREG_PICU6_INTTYPE5 #define SCSI_Out_DBx__DB2__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB2__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB2__MASK 0x20u @@ -2208,6 +2279,7 @@ #define SCSI_Out_DBx__DB3__DM2 CYREG_PRT6_DM2 #define SCSI_Out_DBx__DB3__DR CYREG_PRT6_DR #define SCSI_Out_DBx__DB3__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Out_DBx__DB3__INTTYPE CYREG_PICU6_INTTYPE4 #define SCSI_Out_DBx__DB3__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Out_DBx__DB3__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Out_DBx__DB3__MASK 0x10u @@ -2235,6 +2307,7 @@ #define SCSI_Out_DBx__DB4__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__DB4__DR CYREG_PRT2_DR #define SCSI_Out_DBx__DB4__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__DB4__INTTYPE CYREG_PICU2_INTTYPE7 #define SCSI_Out_DBx__DB4__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__DB4__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__DB4__MASK 0x80u @@ -2262,6 +2335,7 @@ #define SCSI_Out_DBx__DB5__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__DB5__DR CYREG_PRT2_DR #define SCSI_Out_DBx__DB5__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__DB5__INTTYPE CYREG_PICU2_INTTYPE6 #define SCSI_Out_DBx__DB5__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__DB5__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__DB5__MASK 0x40u @@ -2289,6 +2363,7 @@ #define SCSI_Out_DBx__DB6__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__DB6__DR CYREG_PRT2_DR #define SCSI_Out_DBx__DB6__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__DB6__INTTYPE CYREG_PICU2_INTTYPE3 #define SCSI_Out_DBx__DB6__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__DB6__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__DB6__MASK 0x08u @@ -2316,6 +2391,7 @@ #define SCSI_Out_DBx__DB7__DM2 CYREG_PRT2_DM2 #define SCSI_Out_DBx__DB7__DR CYREG_PRT2_DR #define SCSI_Out_DBx__DB7__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Out_DBx__DB7__INTTYPE CYREG_PICU2_INTTYPE2 #define SCSI_Out_DBx__DB7__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Out_DBx__DB7__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Out_DBx__DB7__MASK 0x04u @@ -2389,6 +2465,7 @@ #define SCSI_Noise__0__DM2 CYREG_PRT2_DM2 #define SCSI_Noise__0__DR CYREG_PRT2_DR #define SCSI_Noise__0__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Noise__0__INTTYPE CYREG_PICU2_INTTYPE0 #define SCSI_Noise__0__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Noise__0__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Noise__0__MASK 0x01u @@ -2416,6 +2493,7 @@ #define SCSI_Noise__1__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__1__DR CYREG_PRT6_DR #define SCSI_Noise__1__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__1__INTTYPE CYREG_PICU6_INTTYPE3 #define SCSI_Noise__1__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__1__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__1__MASK 0x08u @@ -2443,6 +2521,7 @@ #define SCSI_Noise__2__DM2 CYREG_PRT4_DM2 #define SCSI_Noise__2__DR CYREG_PRT4_DR #define SCSI_Noise__2__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Noise__2__INTTYPE CYREG_PICU4_INTTYPE3 #define SCSI_Noise__2__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Noise__2__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Noise__2__MASK 0x08u @@ -2470,6 +2549,7 @@ #define SCSI_Noise__3__DM2 CYREG_PRT4_DM2 #define SCSI_Noise__3__DR CYREG_PRT4_DR #define SCSI_Noise__3__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Noise__3__INTTYPE CYREG_PICU4_INTTYPE7 #define SCSI_Noise__3__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Noise__3__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Noise__3__MASK 0x80u @@ -2497,6 +2577,7 @@ #define SCSI_Noise__4__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__4__DR CYREG_PRT6_DR #define SCSI_Noise__4__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__4__INTTYPE CYREG_PICU6_INTTYPE2 #define SCSI_Noise__4__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__4__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__4__MASK 0x04u @@ -2524,6 +2605,7 @@ #define SCSI_Noise__ACK__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__ACK__DR CYREG_PRT6_DR #define SCSI_Noise__ACK__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__ACK__INTTYPE CYREG_PICU6_INTTYPE2 #define SCSI_Noise__ACK__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__ACK__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__ACK__MASK 0x04u @@ -2551,6 +2633,7 @@ #define SCSI_Noise__ATN__DM2 CYREG_PRT2_DM2 #define SCSI_Noise__ATN__DR CYREG_PRT2_DR #define SCSI_Noise__ATN__INP_DIS CYREG_PRT2_INP_DIS +#define SCSI_Noise__ATN__INTTYPE CYREG_PICU2_INTTYPE0 #define SCSI_Noise__ATN__LCD_COM_SEG CYREG_PRT2_LCD_COM_SEG #define SCSI_Noise__ATN__LCD_EN CYREG_PRT2_LCD_EN #define SCSI_Noise__ATN__MASK 0x01u @@ -2578,6 +2661,7 @@ #define SCSI_Noise__BSY__DM2 CYREG_PRT6_DM2 #define SCSI_Noise__BSY__DR CYREG_PRT6_DR #define SCSI_Noise__BSY__INP_DIS CYREG_PRT6_INP_DIS +#define SCSI_Noise__BSY__INTTYPE CYREG_PICU6_INTTYPE3 #define SCSI_Noise__BSY__LCD_COM_SEG CYREG_PRT6_LCD_COM_SEG #define SCSI_Noise__BSY__LCD_EN CYREG_PRT6_LCD_EN #define SCSI_Noise__BSY__MASK 0x08u @@ -2605,6 +2689,7 @@ #define SCSI_Noise__RST__DM2 CYREG_PRT4_DM2 #define SCSI_Noise__RST__DR CYREG_PRT4_DR #define SCSI_Noise__RST__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Noise__RST__INTTYPE CYREG_PICU4_INTTYPE7 #define SCSI_Noise__RST__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Noise__RST__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Noise__RST__MASK 0x80u @@ -2632,6 +2717,7 @@ #define SCSI_Noise__SEL__DM2 CYREG_PRT4_DM2 #define SCSI_Noise__SEL__DR CYREG_PRT4_DR #define SCSI_Noise__SEL__INP_DIS CYREG_PRT4_INP_DIS +#define SCSI_Noise__SEL__INTTYPE CYREG_PICU4_INTTYPE3 #define SCSI_Noise__SEL__LCD_COM_SEG CYREG_PRT4_LCD_COM_SEG #define SCSI_Noise__SEL__LCD_EN CYREG_PRT4_LCD_EN #define SCSI_Noise__SEL__MASK 0x08u @@ -2699,8 +2785,8 @@ #define scsiTarget_StatusReg__0__POS 0 #define scsiTarget_StatusReg__1__MASK 0x02u #define scsiTarget_StatusReg__1__POS 1 -#define scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB07_08_ACTL -#define scsiTarget_StatusReg__16BIT_STATUS_REG CYREG_B0_UDB07_08_ST +#define scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB03_04_ACTL +#define scsiTarget_StatusReg__16BIT_STATUS_REG CYREG_B0_UDB03_04_ST #define scsiTarget_StatusReg__2__MASK 0x04u #define scsiTarget_StatusReg__2__POS 2 #define scsiTarget_StatusReg__3__MASK 0x08u @@ -2708,9 +2794,9 @@ #define scsiTarget_StatusReg__4__MASK 0x10u #define scsiTarget_StatusReg__4__POS 4 #define scsiTarget_StatusReg__MASK 0x1Fu -#define scsiTarget_StatusReg__MASK_REG CYREG_B0_UDB07_MSK -#define scsiTarget_StatusReg__STATUS_AUX_CTL_REG CYREG_B0_UDB07_ACTL -#define scsiTarget_StatusReg__STATUS_REG CYREG_B0_UDB07_ST +#define scsiTarget_StatusReg__MASK_REG CYREG_B0_UDB03_MSK +#define scsiTarget_StatusReg__STATUS_AUX_CTL_REG CYREG_B0_UDB03_ACTL +#define scsiTarget_StatusReg__STATUS_REG CYREG_B0_UDB03_ST /* Debug_Timer_Interrupt */ #define Debug_Timer_Interrupt__INTC_CLR_EN_REG CYREG_NVIC_CLRENA0 @@ -2831,8 +2917,8 @@ #define SCSI_Filtered_sts_sts_reg__0__POS 0 #define SCSI_Filtered_sts_sts_reg__1__MASK 0x02u #define SCSI_Filtered_sts_sts_reg__1__POS 1 -#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB11_12_ACTL -#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB11_12_ST +#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB02_03_ACTL +#define SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB02_03_ST #define SCSI_Filtered_sts_sts_reg__2__MASK 0x04u #define SCSI_Filtered_sts_sts_reg__2__POS 2 #define SCSI_Filtered_sts_sts_reg__3__MASK 0x08u @@ -2840,79 +2926,83 @@ #define SCSI_Filtered_sts_sts_reg__4__MASK 0x10u #define SCSI_Filtered_sts_sts_reg__4__POS 4 #define SCSI_Filtered_sts_sts_reg__MASK 0x1Fu -#define SCSI_Filtered_sts_sts_reg__MASK_REG CYREG_B0_UDB11_MSK -#define SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB11_ACTL -#define SCSI_Filtered_sts_sts_reg__STATUS_REG CYREG_B0_UDB11_ST +#define SCSI_Filtered_sts_sts_reg__MASK_REG CYREG_B0_UDB02_MSK +#define SCSI_Filtered_sts_sts_reg__MASK_ST_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL +#define SCSI_Filtered_sts_sts_reg__PER_ST_AUX_CTL_REG CYREG_B0_UDB02_MSK_ACTL +#define SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB02_ACTL +#define SCSI_Filtered_sts_sts_reg__STATUS_CNT_REG CYREG_B0_UDB02_ST_CTL +#define SCSI_Filtered_sts_sts_reg__STATUS_CONTROL_REG CYREG_B0_UDB02_ST_CTL +#define SCSI_Filtered_sts_sts_reg__STATUS_REG CYREG_B0_UDB02_ST /* SCSI_CTL_PHASE */ #define SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS 0 #define SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK 0x02u #define SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS 1 -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB05_06_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB05_06_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB05_06_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB05_06_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB05_06_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB05_06_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB05_06_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB05_06_MSK -#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB05_06_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB12_13_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB12_13_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB12_13_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB12_13_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB12_13_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB12_13_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB12_13_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB12_13_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB12_13_MSK #define SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK 0x04u #define SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS 2 -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB05_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB05_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB05_ST_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB05_CTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB05_ST_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB12_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB12_ST_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB12_CTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB12_ST_CTL #define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK 0x07u -#define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB05_MSK_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB05_MSK_ACTL -#define SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB05_MSK +#define SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB12_MSK_ACTL +#define SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB12_MSK /* SCSI_Glitch_Ctl */ #define SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK 0x01u #define SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS 0 -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB06_07_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB06_07_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB06_07_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB06_07_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB06_07_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB06_07_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB06_07_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB06_07_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB06_07_MSK -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB06_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB06_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB06_ST_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB06_CTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB06_ST_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG CYREG_B0_UDB13_14_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG CYREG_B0_UDB13_14_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG CYREG_B0_UDB13_14_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG CYREG_B0_UDB13_14_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG CYREG_B0_UDB13_14_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG CYREG_B0_UDB13_14_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG CYREG_B0_UDB13_14_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG CYREG_B0_UDB13_14_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG CYREG_B0_UDB13_14_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG CYREG_B0_UDB13_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG CYREG_B0_UDB13_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG CYREG_B0_UDB13_ST_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG CYREG_B0_UDB13_CTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG CYREG_B0_UDB13_ST_CTL #define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK 0x01u -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB06_MSK_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB06_MSK_ACTL -#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB06_MSK +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG CYREG_B0_UDB13_MSK_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG CYREG_B0_UDB13_MSK_ACTL +#define SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG CYREG_B0_UDB13_MSK /* SCSI_Parity_Error */ #define SCSI_Parity_Error_sts_sts_reg__0__MASK 0x01u #define SCSI_Parity_Error_sts_sts_reg__0__POS 0 -#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB10_11_ACTL -#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB10_11_ST +#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG CYREG_B0_UDB11_12_ACTL +#define SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG CYREG_B0_UDB11_12_ST #define SCSI_Parity_Error_sts_sts_reg__MASK 0x01u -#define SCSI_Parity_Error_sts_sts_reg__MASK_REG CYREG_B0_UDB10_MSK -#define SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB10_ACTL -#define SCSI_Parity_Error_sts_sts_reg__STATUS_REG CYREG_B0_UDB10_ST +#define SCSI_Parity_Error_sts_sts_reg__MASK_REG CYREG_B0_UDB11_MSK +#define SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG CYREG_B0_UDB11_ACTL +#define SCSI_Parity_Error_sts_sts_reg__STATUS_REG CYREG_B0_UDB11_ST /* Miscellaneous */ #define BCLK__BUS_CLK__HZ 50000000U #define BCLK__BUS_CLK__KHZ 50000U #define BCLK__BUS_CLK__MHZ 50U #define CY_PROJECT_NAME "SCSI2SD" -#define CY_VERSION "PSoC Creator 3.2" -#define CYDEV_CHIP_DIE_GEN4 2u +#define CY_VERSION "PSoC Creator 3.3" #define CYDEV_CHIP_DIE_LEOPARD 1u -#define CYDEV_CHIP_DIE_PANTHER 12u -#define CYDEV_CHIP_DIE_PSOC4A 5u -#define CYDEV_CHIP_DIE_PSOC5LP 11u +#define CYDEV_CHIP_DIE_PANTHER 18u +#define CYDEV_CHIP_DIE_PSOC4A 10u +#define CYDEV_CHIP_DIE_PSOC5LP 17u +#define CYDEV_CHIP_DIE_TMA4 2u #define CYDEV_CHIP_DIE_UNKNOWN 0u #define CYDEV_CHIP_FAMILY_PSOC3 1u #define CYDEV_CHIP_FAMILY_PSOC4 2u @@ -2921,23 +3011,26 @@ #define CYDEV_CHIP_FAMILY_USED CYDEV_CHIP_FAMILY_PSOC5 #define CYDEV_CHIP_JTAG_ID 0x2E133069u #define CYDEV_CHIP_MEMBER_3A 1u -#define CYDEV_CHIP_MEMBER_4A 5u -#define CYDEV_CHIP_MEMBER_4C 9u -#define CYDEV_CHIP_MEMBER_4D 3u +#define CYDEV_CHIP_MEMBER_4A 10u +#define CYDEV_CHIP_MEMBER_4C 15u +#define CYDEV_CHIP_MEMBER_4D 6u #define CYDEV_CHIP_MEMBER_4E 4u -#define CYDEV_CHIP_MEMBER_4F 6u +#define CYDEV_CHIP_MEMBER_4F 11u #define CYDEV_CHIP_MEMBER_4G 2u -#define CYDEV_CHIP_MEMBER_4L 8u -#define CYDEV_CHIP_MEMBER_4M 7u -#define CYDEV_CHIP_MEMBER_5A 11u -#define CYDEV_CHIP_MEMBER_5B 10u +#define CYDEV_CHIP_MEMBER_4H 9u +#define CYDEV_CHIP_MEMBER_4I 14u +#define CYDEV_CHIP_MEMBER_4J 7u +#define CYDEV_CHIP_MEMBER_4K 8u +#define CYDEV_CHIP_MEMBER_4L 13u +#define CYDEV_CHIP_MEMBER_4M 12u +#define CYDEV_CHIP_MEMBER_4N 5u +#define CYDEV_CHIP_MEMBER_4U 3u +#define CYDEV_CHIP_MEMBER_5A 17u +#define CYDEV_CHIP_MEMBER_5B 16u #define CYDEV_CHIP_MEMBER_UNKNOWN 0u #define CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_MEMBER_5B #define CYDEV_CHIP_DIE_EXPECT CYDEV_CHIP_MEMBER_USED #define CYDEV_CHIP_DIE_ACTUAL CYDEV_CHIP_DIE_EXPECT -#define CYDEV_CHIP_REV_GEN4_ES 17u -#define CYDEV_CHIP_REV_GEN4_ES2 33u -#define CYDEV_CHIP_REV_GEN4_PRODUCTION 17u #define CYDEV_CHIP_REV_LEOPARD_ES1 0u #define CYDEV_CHIP_REV_LEOPARD_ES2 1u #define CYDEV_CHIP_REV_LEOPARD_ES3 3u @@ -2949,6 +3042,9 @@ #define CYDEV_CHIP_REV_PSOC4A_PRODUCTION 17u #define CYDEV_CHIP_REV_PSOC5LP_ES0 0u #define CYDEV_CHIP_REV_PSOC5LP_PRODUCTION 0u +#define CYDEV_CHIP_REV_TMA4_ES 17u +#define CYDEV_CHIP_REV_TMA4_ES2 33u +#define CYDEV_CHIP_REV_TMA4_PRODUCTION 17u #define CYDEV_CHIP_REVISION_3A_ES1 0u #define CYDEV_CHIP_REVISION_3A_ES2 1u #define CYDEV_CHIP_REVISION_3A_ES3 3u @@ -2959,12 +3055,19 @@ #define CYDEV_CHIP_REVISION_4D_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4E_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4F_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA 0u #define CYDEV_CHIP_REVISION_4F_PRODUCTION_256K 0u #define CYDEV_CHIP_REVISION_4G_ES 17u #define CYDEV_CHIP_REVISION_4G_ES2 33u #define CYDEV_CHIP_REVISION_4G_PRODUCTION 17u +#define CYDEV_CHIP_REVISION_4H_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4I_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4J_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4K_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4L_PRODUCTION 0u #define CYDEV_CHIP_REVISION_4M_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4N_PRODUCTION 0u +#define CYDEV_CHIP_REVISION_4U_PRODUCTION 0u #define CYDEV_CHIP_REVISION_5A_ES0 0u #define CYDEV_CHIP_REVISION_5A_ES1 1u #define CYDEV_CHIP_REVISION_5A_PRODUCTION 1u @@ -2997,6 +3100,8 @@ #define CYDEV_HEAP_SIZE 0x0400 #define CYDEV_INSTRUCT_CACHE_ENABLED 1 #define CYDEV_INTR_RISING 0x0000007Eu +#define CYDEV_IS_EXPORTING_CODE 0 +#define CYDEV_IS_IMPORTING_CODE 0 #define CYDEV_PROJ_TYPE 2 #define CYDEV_PROJ_TYPE_BOOTLOADER 1 #define CYDEV_PROJ_TYPE_LAUNCHER 5 @@ -3009,23 +3114,23 @@ #define CYDEV_USB_CLK_OSC_LOCKING_ENABLED_AT_PWR_UP #define CYDEV_USE_BUNDLED_CMSIS 1 #define CYDEV_VARIABLE_VDDA 0 -#define CYDEV_VDDA 5.0 +#define CYDEV_VDDA 5 #define CYDEV_VDDA_MV 5000 -#define CYDEV_VDDD 5.0 +#define CYDEV_VDDD 5 #define CYDEV_VDDD_MV 5000 -#define CYDEV_VDDIO0 5.0 +#define CYDEV_VDDIO0 5 #define CYDEV_VDDIO0_MV 5000 -#define CYDEV_VDDIO1 5.0 +#define CYDEV_VDDIO1 5 #define CYDEV_VDDIO1_MV 5000 -#define CYDEV_VDDIO2 5.0 +#define CYDEV_VDDIO2 5 #define CYDEV_VDDIO2_MV 5000 #define CYDEV_VDDIO3 3.3 #define CYDEV_VDDIO3_MV 3300 -#define CYDEV_VIO0 5.0 +#define CYDEV_VIO0 5 #define CYDEV_VIO0_MV 5000 -#define CYDEV_VIO1 5.0 +#define CYDEV_VIO1 5 #define CYDEV_VIO1_MV 5000 -#define CYDEV_VIO2 5.0 +#define CYDEV_VIO2 5 #define CYDEV_VIO2_MV 5000 #define CYDEV_VIO3 3.3 #define CYDEV_VIO3_MV 3300 diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c index ce8b5dba..73329e61 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cyfitter_cfg.c +* File Name: cyfitter_cfg.c * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file contains device initialization code. * Except for the user defined sections in CyClockStartupError(), this file should not be modified. * This file is automatically generated by PSoC Creator. @@ -122,7 +122,7 @@ static void CyClockStartupError(uint8 errorCode) } #endif -#define CY_CFG_BASE_ADDR_COUNT 40u +#define CY_CFG_BASE_ADDR_COUNT 41u CYPACKED typedef struct { uint8 offset; @@ -381,98 +381,97 @@ void cyfitter_cfg(void) static const uint32 CYCODE cy_cfg_addr_table[] = { 0x40004501u, /* Base address: 0x40004500 Count: 1 */ 0x40004F02u, /* Base address: 0x40004F00 Count: 2 */ - 0x40005210u, /* Base address: 0x40005200 Count: 16 */ - 0x40006402u, /* Base address: 0x40006400 Count: 2 */ - 0x4001003Du, /* Base address: 0x40010000 Count: 61 */ - 0x4001013Du, /* Base address: 0x40010100 Count: 61 */ - 0x40010240u, /* Base address: 0x40010200 Count: 64 */ - 0x4001034Fu, /* Base address: 0x40010300 Count: 79 */ - 0x4001044Cu, /* Base address: 0x40010400 Count: 76 */ - 0x4001055Eu, /* Base address: 0x40010500 Count: 94 */ - 0x40010656u, /* Base address: 0x40010600 Count: 86 */ - 0x4001075Bu, /* Base address: 0x40010700 Count: 91 */ - 0x40010923u, /* Base address: 0x40010900 Count: 35 */ - 0x40010A51u, /* Base address: 0x40010A00 Count: 81 */ - 0x40010B54u, /* Base address: 0x40010B00 Count: 84 */ - 0x40010C4Eu, /* Base address: 0x40010C00 Count: 78 */ - 0x40010D4Au, /* Base address: 0x40010D00 Count: 74 */ - 0x40010E04u, /* Base address: 0x40010E00 Count: 4 */ - 0x40010F07u, /* Base address: 0x40010F00 Count: 7 */ - 0x40011422u, /* Base address: 0x40011400 Count: 34 */ - 0x40011552u, /* Base address: 0x40011500 Count: 82 */ - 0x40011646u, /* Base address: 0x40011600 Count: 70 */ - 0x40011750u, /* Base address: 0x40011700 Count: 80 */ - 0x40011916u, /* Base address: 0x40011900 Count: 22 */ - 0x40011A50u, /* Base address: 0x40011A00 Count: 80 */ - 0x40011B49u, /* Base address: 0x40011B00 Count: 73 */ - 0x40014016u, /* Base address: 0x40014000 Count: 22 */ - 0x4001411Cu, /* Base address: 0x40014100 Count: 28 */ - 0x4001421Au, /* Base address: 0x40014200 Count: 26 */ - 0x4001430Du, /* Base address: 0x40014300 Count: 13 */ - 0x40014410u, /* Base address: 0x40014400 Count: 16 */ - 0x40014516u, /* Base address: 0x40014500 Count: 22 */ - 0x40014614u, /* Base address: 0x40014600 Count: 20 */ - 0x40014713u, /* Base address: 0x40014700 Count: 19 */ - 0x40014808u, /* Base address: 0x40014800 Count: 8 */ - 0x4001490Au, /* Base address: 0x40014900 Count: 10 */ - 0x40014C09u, /* Base address: 0x40014C00 Count: 9 */ - 0x40014D0Cu, /* Base address: 0x40014D00 Count: 12 */ - 0x40015005u, /* Base address: 0x40015000 Count: 5 */ + 0x4000520Eu, /* Base address: 0x40005200 Count: 14 */ + 0x40006401u, /* Base address: 0x40006400 Count: 1 */ + 0x40006501u, /* Base address: 0x40006500 Count: 1 */ + 0x40010042u, /* Base address: 0x40010000 Count: 66 */ + 0x40010143u, /* Base address: 0x40010100 Count: 67 */ + 0x4001023Fu, /* Base address: 0x40010200 Count: 63 */ + 0x40010351u, /* Base address: 0x40010300 Count: 81 */ + 0x40010448u, /* Base address: 0x40010400 Count: 72 */ + 0x40010550u, /* Base address: 0x40010500 Count: 80 */ + 0x40010653u, /* Base address: 0x40010600 Count: 83 */ + 0x40010751u, /* Base address: 0x40010700 Count: 81 */ + 0x40010911u, /* Base address: 0x40010900 Count: 17 */ + 0x40010A4Du, /* Base address: 0x40010A00 Count: 77 */ + 0x40010B50u, /* Base address: 0x40010B00 Count: 80 */ + 0x40010C4Cu, /* Base address: 0x40010C00 Count: 76 */ + 0x40010D57u, /* Base address: 0x40010D00 Count: 87 */ + 0x40010E50u, /* Base address: 0x40010E00 Count: 80 */ + 0x40010F3Du, /* Base address: 0x40010F00 Count: 61 */ + 0x40011420u, /* Base address: 0x40011400 Count: 32 */ + 0x40011545u, /* Base address: 0x40011500 Count: 69 */ + 0x40011652u, /* Base address: 0x40011600 Count: 82 */ + 0x40011748u, /* Base address: 0x40011700 Count: 72 */ + 0x40011804u, /* Base address: 0x40011800 Count: 4 */ + 0x40011908u, /* Base address: 0x40011900 Count: 8 */ + 0x40011B04u, /* Base address: 0x40011B00 Count: 4 */ + 0x4001401Au, /* Base address: 0x40014000 Count: 26 */ + 0x40014117u, /* Base address: 0x40014100 Count: 23 */ + 0x4001420Eu, /* Base address: 0x40014200 Count: 14 */ + 0x40014307u, /* Base address: 0x40014300 Count: 7 */ + 0x4001440Eu, /* Base address: 0x40014400 Count: 14 */ + 0x4001451Bu, /* Base address: 0x40014500 Count: 27 */ + 0x40014612u, /* Base address: 0x40014600 Count: 18 */ + 0x4001470Eu, /* Base address: 0x40014700 Count: 14 */ + 0x40014807u, /* Base address: 0x40014800 Count: 7 */ + 0x40014909u, /* Base address: 0x40014900 Count: 9 */ + 0x40014C05u, /* Base address: 0x40014C00 Count: 5 */ + 0x40014D0Eu, /* Base address: 0x40014D00 Count: 14 */ + 0x40015002u, /* Base address: 0x40015000 Count: 2 */ 0x40015104u, /* Base address: 0x40015100 Count: 4 */ }; static const cy_cfg_addrvalue_t CYCODE cy_cfg_data_table[] = { {0x7Eu, 0x02u}, {0x01u, 0x20u}, - {0x0Au, 0x4Bu}, - {0x00u, 0x01u}, - {0x01u, 0x48u}, + {0x0Au, 0x36u}, + {0x00u, 0x04u}, + {0x01u, 0x41u}, {0x04u, 0x31u}, - {0x10u, 0x84u}, - {0x11u, 0x08u}, - {0x18u, 0x04u}, - {0x19u, 0x08u}, + {0x10u, 0x0Cu}, + {0x11u, 0x44u}, + {0x19u, 0x04u}, {0x1Cu, 0x30u}, {0x20u, 0x10u}, {0x24u, 0x44u}, - {0x28u, 0x02u}, - {0x29u, 0x01u}, + {0x28u, 0x01u}, + {0x29u, 0x03u}, {0x30u, 0x20u}, {0x31u, 0x30u}, - {0x78u, 0x20u}, {0x7Cu, 0x40u}, - {0x20u, 0x02u}, - {0x8Cu, 0x0Fu}, - {0x08u, 0x28u}, - {0x0Au, 0x14u}, - {0x11u, 0x01u}, - {0x12u, 0x1Cu}, - {0x13u, 0x02u}, - {0x14u, 0x10u}, - {0x15u, 0x04u}, - {0x16u, 0x20u}, - {0x18u, 0x24u}, - {0x1Au, 0x08u}, - {0x1Bu, 0x02u}, - {0x1Cu, 0x02u}, - {0x22u, 0x20u}, - {0x24u, 0x01u}, - {0x2Bu, 0x01u}, - {0x2Cu, 0x40u}, - {0x2Du, 0x08u}, - {0x30u, 0x3Cu}, - {0x31u, 0x08u}, - {0x32u, 0x40u}, - {0x33u, 0x04u}, - {0x34u, 0x01u}, + {0x20u, 0x01u}, + {0x86u, 0x0Fu}, + {0x01u, 0x01u}, + {0x03u, 0x02u}, + {0x06u, 0x08u}, + {0x09u, 0x24u}, + {0x0Bu, 0x08u}, + {0x0Cu, 0x99u}, + {0x0Eu, 0x22u}, + {0x0Fu, 0x1Du}, + {0x12u, 0x07u}, + {0x13u, 0x20u}, + {0x14u, 0xAAu}, + {0x15u, 0x10u}, + {0x16u, 0x55u}, + {0x17u, 0x20u}, + {0x1Au, 0x70u}, + {0x1Fu, 0x02u}, + {0x26u, 0x80u}, + {0x28u, 0x44u}, + {0x29u, 0x28u}, + {0x2Au, 0x88u}, + {0x2Bu, 0x14u}, + {0x30u, 0x0Fu}, + {0x31u, 0x3Cu}, + {0x34u, 0xF0u}, {0x35u, 0x03u}, - {0x36u, 0x02u}, - {0x3Eu, 0x54u}, - {0x3Fu, 0x15u}, + {0x3Fu, 0x10u}, {0x40u, 0x63u}, - {0x41u, 0x02u}, - {0x42u, 0x50u}, - {0x45u, 0x2Cu}, + {0x41u, 0x05u}, + {0x42u, 0x10u}, + {0x45u, 0xC2u}, {0x46u, 0xEDu}, {0x47u, 0x0Fu}, {0x48u, 0x1Fu}, @@ -485,1395 +484,1324 @@ void cyfitter_cfg(void) {0x59u, 0x04u}, {0x5Au, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x01u}, + {0x5Cu, 0x11u}, {0x5Du, 0x01u}, {0x5Fu, 0x01u}, - {0x62u, 0xC0u}, + {0x60u, 0x08u}, + {0x62u, 0xC8u}, {0x66u, 0x80u}, {0x68u, 0x40u}, {0x69u, 0x40u}, {0x6Eu, 0x08u}, - {0x80u, 0x02u}, + {0x90u, 0x02u}, + {0x92u, 0x01u}, + {0x94u, 0x01u}, + {0x96u, 0x02u}, {0x99u, 0x01u}, - {0xA8u, 0x01u}, - {0xB0u, 0x02u}, - {0xB1u, 0x01u}, - {0xB6u, 0x01u}, - {0xBEu, 0x41u}, - {0xBFu, 0x01u}, + {0xA0u, 0x02u}, + {0xA2u, 0x01u}, + {0xB2u, 0x03u}, + {0xB3u, 0x01u}, + {0xBAu, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, + {0xDBu, 0x04u}, + {0xDCu, 0x99u}, {0xDFu, 0x01u}, - {0x03u, 0x08u}, - {0x06u, 0x80u}, - {0x08u, 0x40u}, - {0x09u, 0x20u}, - {0x0Au, 0x40u}, - {0x0Bu, 0x20u}, - {0x10u, 0x80u}, - {0x12u, 0x10u}, - {0x13u, 0x40u}, - {0x16u, 0x08u}, - {0x18u, 0x04u}, - {0x1Au, 0x50u}, - {0x1Bu, 0x80u}, - {0x1Du, 0x41u}, - {0x22u, 0x04u}, - {0x23u, 0x88u}, - {0x25u, 0x02u}, - {0x2Au, 0x40u}, - {0x2Bu, 0x04u}, - {0x31u, 0x10u}, - {0x32u, 0x08u}, - {0x33u, 0x01u}, - {0x35u, 0x20u}, - {0x38u, 0x02u}, - {0x39u, 0x01u}, - {0x41u, 0x20u}, - {0x43u, 0x08u}, - {0x48u, 0x11u}, - {0x49u, 0x02u}, - {0x4Au, 0x50u}, - {0x4Bu, 0x20u}, - {0x50u, 0x40u}, - {0x51u, 0x04u}, - {0x52u, 0x20u}, + {0x02u, 0x02u}, + {0x03u, 0x10u}, + {0x09u, 0x04u}, + {0x0Au, 0x44u}, + {0x0Cu, 0x01u}, + {0x0Eu, 0x20u}, + {0x10u, 0x08u}, + {0x13u, 0x08u}, + {0x17u, 0x01u}, + {0x19u, 0x22u}, + {0x1Au, 0x44u}, + {0x1Eu, 0x20u}, + {0x1Fu, 0x08u}, + {0x20u, 0x40u}, + {0x21u, 0x20u}, + {0x27u, 0x20u}, + {0x2Au, 0x20u}, + {0x30u, 0x08u}, + {0x32u, 0x01u}, + {0x33u, 0x40u}, + {0x36u, 0x20u}, + {0x38u, 0x42u}, + {0x3Au, 0x50u}, + {0x41u, 0x40u}, + {0x42u, 0x20u}, + {0x44u, 0x10u}, + {0x45u, 0x08u}, + {0x48u, 0x08u}, + {0x49u, 0x04u}, + {0x4Au, 0xC2u}, + {0x4Bu, 0x04u}, + {0x51u, 0x08u}, + {0x53u, 0x50u}, + {0x58u, 0x04u}, {0x59u, 0x01u}, - {0x5Au, 0x18u}, + {0x5Au, 0x10u}, {0x5Bu, 0x80u}, - {0x60u, 0x24u}, - {0x61u, 0x42u}, - {0x69u, 0x96u}, - {0x70u, 0x81u}, - {0x71u, 0x08u}, - {0x72u, 0x04u}, - {0x81u, 0x40u}, - {0x85u, 0x04u}, - {0x89u, 0x01u}, - {0x8Cu, 0x40u}, - {0x8Du, 0x40u}, - {0x8Fu, 0x08u}, - {0xC0u, 0x12u}, - {0xC2u, 0x0Fu}, - {0xC4u, 0x4Du}, - {0xCAu, 0x0Cu}, - {0xCCu, 0x27u}, - {0xD0u, 0x06u}, + {0x5Du, 0x03u}, + {0x60u, 0x0Au}, + {0x61u, 0x02u}, + {0x63u, 0x20u}, + {0x69u, 0x40u}, + {0x6Au, 0x02u}, + {0x6Bu, 0x18u}, + {0x6Cu, 0x01u}, + {0x70u, 0x20u}, + {0x72u, 0x80u}, + {0x73u, 0x12u}, + {0x80u, 0x08u}, + {0x81u, 0x01u}, + {0x84u, 0x02u}, + {0x86u, 0x12u}, + {0x8Au, 0xC0u}, + {0x8Fu, 0x20u}, + {0xC0u, 0x05u}, + {0xC2u, 0x3Eu}, + {0xC4u, 0x16u}, + {0xCAu, 0x04u}, + {0xCCu, 0x2Bu}, + {0xCEu, 0x0Du}, + {0xD0u, 0x0Au}, {0xD2u, 0x0Cu}, {0xD6u, 0x0Fu}, {0xD8u, 0x0Fu}, - {0xE0u, 0x01u}, - {0xE4u, 0x02u}, - {0xE6u, 0x10u}, - {0x00u, 0x20u}, - {0x02u, 0xC0u}, - {0x04u, 0x4Bu}, - {0x06u, 0xB0u}, - {0x07u, 0x01u}, - {0x0Cu, 0x08u}, - {0x12u, 0x04u}, - {0x13u, 0x02u}, - {0x14u, 0x74u}, - {0x16u, 0x8Bu}, - {0x18u, 0x41u}, - {0x1Au, 0xA4u}, - {0x1Cu, 0x20u}, - {0x1Eu, 0x0Eu}, - {0x22u, 0x3Fu}, - {0x2Au, 0x03u}, - {0x2Fu, 0x04u}, - {0x31u, 0x02u}, - {0x34u, 0x1Fu}, - {0x35u, 0x04u}, - {0x36u, 0xE0u}, - {0x37u, 0x01u}, - {0x3Au, 0x80u}, - {0x56u, 0x08u}, + {0xE0u, 0x50u}, + {0xE2u, 0x2Eu}, + {0xE6u, 0x16u}, + {0x00u, 0x0Fu}, + {0x01u, 0x03u}, + {0x02u, 0xF0u}, + {0x03u, 0x0Cu}, + {0x04u, 0xFFu}, + {0x05u, 0xFFu}, + {0x08u, 0x05u}, + {0x09u, 0x06u}, + {0x0Au, 0x0Au}, + {0x0Bu, 0x09u}, + {0x0Cu, 0x90u}, + {0x0Eu, 0x60u}, + {0x10u, 0xFFu}, + {0x11u, 0x0Fu}, + {0x13u, 0xF0u}, + {0x15u, 0x50u}, + {0x17u, 0xA0u}, + {0x18u, 0x09u}, + {0x19u, 0x05u}, + {0x1Au, 0x06u}, + {0x1Bu, 0x0Au}, + {0x1Eu, 0xFFu}, + {0x1Fu, 0xFFu}, + {0x20u, 0x03u}, + {0x21u, 0x60u}, + {0x22u, 0x0Cu}, + {0x23u, 0x90u}, + {0x24u, 0x50u}, + {0x25u, 0x30u}, + {0x26u, 0xA0u}, + {0x27u, 0xC0u}, + {0x28u, 0x30u}, + {0x2Au, 0xC0u}, + {0x2Fu, 0xFFu}, + {0x30u, 0xFFu}, + {0x31u, 0xFFu}, + {0x3Eu, 0x01u}, + {0x3Fu, 0x01u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x91u}, - {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x81u, 0x07u}, - {0x82u, 0x10u}, - {0x84u, 0x8Du}, - {0x87u, 0x02u}, - {0x88u, 0x8Du}, - {0x8Cu, 0x02u}, - {0x8Eu, 0x0Du}, - {0x91u, 0x01u}, - {0x92u, 0x80u}, - {0x94u, 0x62u}, - {0x95u, 0x04u}, - {0x96u, 0x08u}, - {0x98u, 0x02u}, - {0x9Au, 0x54u}, + {0x82u, 0x20u}, + {0x86u, 0x07u}, + {0x88u, 0x07u}, + {0x8Au, 0x18u}, + {0x8Cu, 0x28u}, + {0x8Eu, 0x16u}, + {0x90u, 0x05u}, + {0x94u, 0x2Au}, + {0x96u, 0x15u}, + {0x9Au, 0x02u}, {0x9Cu, 0x01u}, - {0x9Eu, 0x32u}, - {0x9Fu, 0x07u}, - {0xA0u, 0x0Du}, - {0xA2u, 0x80u}, - {0xA4u, 0x8Du}, - {0xA8u, 0x8Du}, - {0xB0u, 0x0Fu}, - {0xB4u, 0x80u}, - {0xB5u, 0x07u}, - {0xB6u, 0x70u}, - {0xBAu, 0x02u}, - {0xBEu, 0x10u}, - {0xBFu, 0x10u}, - {0xD6u, 0x08u}, + {0xA8u, 0x2Fu}, + {0xAAu, 0x10u}, + {0xB0u, 0x20u}, + {0xB2u, 0x1Fu}, + {0xBAu, 0x08u}, + {0xBEu, 0x01u}, {0xD8u, 0x04u}, - {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDDu, 0x90u}, + {0xDCu, 0x01u}, {0xDFu, 0x01u}, - {0x00u, 0x60u}, - {0x01u, 0x08u}, - {0x03u, 0x80u}, - {0x04u, 0x85u}, - {0x09u, 0x18u}, - {0x0Au, 0x02u}, - {0x0Bu, 0x88u}, - {0x0Du, 0x20u}, - {0x0Eu, 0x91u}, - {0x10u, 0x80u}, - {0x12u, 0x24u}, - {0x15u, 0x02u}, - {0x17u, 0x10u}, - {0x18u, 0x40u}, - {0x1Bu, 0x90u}, - {0x1Cu, 0x07u}, - {0x1Eu, 0x08u}, - {0x1Fu, 0x10u}, - {0x22u, 0x10u}, - {0x25u, 0x40u}, - {0x26u, 0x01u}, - {0x27u, 0x08u}, - {0x2Eu, 0x10u}, - {0x2Fu, 0x09u}, - {0x31u, 0x08u}, - {0x32u, 0x41u}, - {0x34u, 0x01u}, - {0x38u, 0x02u}, - {0x3Bu, 0x08u}, - {0x3Fu, 0x04u}, - {0x58u, 0x14u}, - {0x59u, 0x81u}, - {0x5Cu, 0x0Au}, - {0x5Du, 0x40u}, - {0x5Fu, 0x20u}, - {0x62u, 0x58u}, - {0x63u, 0xC0u}, - {0x64u, 0x40u}, - {0x65u, 0x20u}, - {0x66u, 0x88u}, - {0x82u, 0x14u}, - {0x84u, 0x10u}, - {0x86u, 0x20u}, - {0x87u, 0x80u}, - {0x8Bu, 0x08u}, - {0x8Du, 0x01u}, - {0x90u, 0x80u}, - {0x91u, 0x59u}, - {0x92u, 0x44u}, - {0x97u, 0x60u}, - {0x98u, 0x1Cu}, - {0x99u, 0x02u}, - {0x9Bu, 0x40u}, - {0x9Cu, 0x40u}, - {0x9Du, 0x30u}, - {0x9Eu, 0xD8u}, - {0x9Fu, 0x01u}, - {0xA2u, 0x50u}, - {0xA4u, 0x01u}, - {0xA5u, 0x20u}, - {0xA6u, 0x08u}, - {0xA7u, 0x0Cu}, - {0xACu, 0x30u}, - {0xAFu, 0x80u}, - {0xB0u, 0x1Cu}, - {0xB1u, 0x08u}, - {0xB6u, 0x20u}, - {0xB7u, 0x40u}, - {0xC0u, 0xBFu}, - {0xC2u, 0xFFu}, - {0xC4u, 0x5Eu}, - {0xCAu, 0x10u}, - {0xCCu, 0x8Bu}, - {0xCEu, 0x43u}, + {0x02u, 0xA2u}, + {0x03u, 0x08u}, + {0x04u, 0x06u}, + {0x05u, 0x21u}, + {0x06u, 0x02u}, + {0x07u, 0x01u}, + {0x08u, 0x01u}, + {0x09u, 0x04u}, + {0x0Bu, 0x87u}, + {0x0Du, 0x10u}, + {0x0Eu, 0x80u}, + {0x0Fu, 0x01u}, + {0x10u, 0x08u}, + {0x15u, 0x01u}, + {0x17u, 0x14u}, + {0x1Bu, 0x09u}, + {0x1Du, 0x02u}, + {0x24u, 0x80u}, + {0x2Eu, 0x06u}, + {0x2Fu, 0x01u}, + {0x35u, 0x21u}, + {0x36u, 0x40u}, + {0x37u, 0x04u}, + {0x3Cu, 0x04u}, + {0x3Du, 0x11u}, + {0x58u, 0x99u}, + {0x5Cu, 0x42u}, + {0x5Du, 0x04u}, + {0x5Eu, 0x20u}, + {0x63u, 0x02u}, + {0x65u, 0x40u}, + {0x6Du, 0x02u}, + {0x6Eu, 0x04u}, + {0x6Fu, 0x55u}, + {0x75u, 0x90u}, + {0x76u, 0xB0u}, + {0x80u, 0x01u}, + {0x82u, 0x80u}, + {0x86u, 0x10u}, + {0x88u, 0x04u}, + {0x8Cu, 0x08u}, + {0x8Du, 0x04u}, + {0x8Eu, 0x90u}, + {0x90u, 0x02u}, + {0x91u, 0x45u}, + {0x93u, 0xB4u}, + {0x95u, 0x80u}, + {0x96u, 0x10u}, + {0x98u, 0x10u}, + {0x99u, 0x24u}, + {0x9Au, 0x40u}, + {0x9Bu, 0x02u}, + {0x9Cu, 0x04u}, + {0x9Fu, 0xC0u}, + {0xA0u, 0x20u}, + {0xA1u, 0x04u}, + {0xA2u, 0x82u}, + {0xA4u, 0x08u}, + {0xA6u, 0x20u}, + {0xA9u, 0x06u}, + {0xAAu, 0x20u}, + {0xABu, 0x10u}, + {0xAFu, 0x41u}, + {0xB0u, 0x01u}, + {0xB1u, 0x24u}, + {0xB3u, 0x08u}, + {0xC0u, 0xFFu}, + {0xC2u, 0xDFu}, + {0xC4u, 0x72u}, + {0xCAu, 0xD0u}, + {0xCCu, 0xF0u}, + {0xCEu, 0xE0u}, {0xD6u, 0xFFu}, - {0xD8u, 0xFFu}, - {0xE2u, 0x09u}, - {0xEAu, 0x01u}, - {0xEEu, 0x02u}, - {0x04u, 0x44u}, - {0x06u, 0x88u}, - {0x07u, 0xFFu}, - {0x0Bu, 0xFFu}, - {0x0Fu, 0xFFu}, - {0x11u, 0x0Fu}, - {0x12u, 0x70u}, - {0x13u, 0xF0u}, - {0x15u, 0x69u}, - {0x16u, 0x07u}, - {0x17u, 0x96u}, - {0x1Au, 0x08u}, - {0x1Du, 0xFFu}, - {0x21u, 0x55u}, - {0x23u, 0xAAu}, - {0x24u, 0x99u}, - {0x26u, 0x22u}, - {0x29u, 0xFFu}, - {0x2Au, 0x80u}, - {0x2Cu, 0xAAu}, - {0x2Du, 0x33u}, - {0x2Eu, 0x55u}, - {0x2Fu, 0xCCu}, - {0x30u, 0xF0u}, - {0x31u, 0xFFu}, - {0x32u, 0x0Fu}, - {0x3Bu, 0x02u}, - {0x56u, 0x08u}, + {0xD8u, 0x18u}, + {0xE0u, 0x01u}, + {0xE2u, 0x0Au}, + {0xE4u, 0x04u}, + {0xE6u, 0x0Au}, + {0xE8u, 0x08u}, + {0xEAu, 0x07u}, + {0xEEu, 0x01u}, + {0x03u, 0x70u}, + {0x04u, 0x05u}, + {0x06u, 0x0Au}, + {0x0Bu, 0x80u}, + {0x0Cu, 0x10u}, + {0x0Eu, 0x2Fu}, + {0x0Fu, 0x08u}, + {0x10u, 0x40u}, + {0x11u, 0x99u}, + {0x12u, 0x1Fu}, + {0x13u, 0x22u}, + {0x17u, 0x07u}, + {0x19u, 0xAAu}, + {0x1Au, 0x70u}, + {0x1Bu, 0x55u}, + {0x1Cu, 0x06u}, + {0x1Eu, 0x09u}, + {0x20u, 0x0Fu}, + {0x24u, 0x20u}, + {0x26u, 0x4Fu}, + {0x28u, 0x03u}, + {0x2Au, 0x0Cu}, + {0x2Du, 0x44u}, + {0x2Fu, 0x88u}, + {0x31u, 0xF0u}, + {0x33u, 0x0Fu}, + {0x34u, 0x7Fu}, + {0x54u, 0x09u}, + {0x56u, 0x04u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, {0x5Cu, 0x11u}, - {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x82u, 0x20u}, - {0x83u, 0x07u}, - {0x84u, 0x8Cu}, - {0x85u, 0x28u}, - {0x86u, 0x30u}, - {0x87u, 0x56u}, - {0x89u, 0x07u}, - {0x8Bu, 0x18u}, - {0x8Du, 0x40u}, - {0x8Eu, 0x02u}, - {0x8Fu, 0xA7u}, - {0x90u, 0xECu}, - {0x92u, 0x13u}, - {0x93u, 0x04u}, - {0x94u, 0x08u}, - {0x95u, 0x0Fu}, - {0x96u, 0x80u}, - {0x97u, 0x90u}, - {0x98u, 0x93u}, - {0x9Au, 0x44u}, - {0x9Cu, 0x71u}, - {0x9Eu, 0x80u}, - {0xA2u, 0x7Fu}, - {0xA5u, 0x21u}, - {0xA7u, 0x02u}, - {0xA8u, 0x03u}, - {0xA9u, 0x0Cu}, - {0xABu, 0xB3u}, - {0xADu, 0x01u}, - {0xB2u, 0x7Fu}, - {0xB3u, 0x1Fu}, - {0xB5u, 0xE0u}, - {0xB6u, 0x80u}, - {0xBBu, 0x28u}, - {0xBEu, 0x40u}, + {0x80u, 0x02u}, + {0x83u, 0x10u}, + {0x8Bu, 0x80u}, + {0x8Cu, 0x02u}, + {0x8Fu, 0x40u}, + {0x90u, 0x02u}, + {0x93u, 0x02u}, + {0x94u, 0x02u}, + {0x98u, 0x04u}, + {0x9Au, 0x08u}, + {0x9Bu, 0x08u}, + {0x9Cu, 0x08u}, + {0x9Eu, 0x04u}, + {0xA3u, 0x04u}, + {0xA5u, 0x55u}, + {0xA7u, 0xAAu}, + {0xABu, 0x01u}, + {0xACu, 0x08u}, + {0xAEu, 0x05u}, + {0xAFu, 0x20u}, + {0xB1u, 0x30u}, + {0xB2u, 0x02u}, + {0xB3u, 0xC0u}, + {0xB4u, 0x0Cu}, + {0xB5u, 0x0Cu}, + {0xB6u, 0x01u}, + {0xB7u, 0x03u}, + {0xB8u, 0x08u}, + {0xBAu, 0x20u}, + {0xBEu, 0x04u}, + {0xBFu, 0x55u}, {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x11u}, + {0xDCu, 0x09u}, {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x01u, 0x08u}, - {0x04u, 0x84u}, - {0x05u, 0x82u}, - {0x06u, 0x02u}, - {0x0Au, 0x54u}, - {0x0Cu, 0x04u}, - {0x0Eu, 0x29u}, - {0x0Fu, 0x40u}, - {0x11u, 0x10u}, + {0x00u, 0x08u}, + {0x02u, 0x02u}, + {0x04u, 0x80u}, + {0x07u, 0x40u}, + {0x08u, 0x01u}, + {0x09u, 0x80u}, + {0x0Au, 0x04u}, + {0x0Du, 0x02u}, + {0x0Eu, 0x1Au}, + {0x11u, 0x28u}, {0x12u, 0x20u}, - {0x13u, 0x40u}, - {0x15u, 0x02u}, - {0x17u, 0x10u}, - {0x1Au, 0x50u}, - {0x1Bu, 0x04u}, - {0x1Du, 0x40u}, - {0x1Fu, 0x08u}, + {0x13u, 0x01u}, + {0x14u, 0x02u}, + {0x1Au, 0x04u}, + {0x1Cu, 0x20u}, + {0x1Eu, 0x0Au}, {0x20u, 0x80u}, - {0x21u, 0x02u}, - {0x24u, 0x14u}, - {0x25u, 0x20u}, - {0x26u, 0x20u}, - {0x2Au, 0x40u}, - {0x2Bu, 0x48u}, - {0x2Du, 0x80u}, - {0x2Fu, 0x28u}, - {0x31u, 0x02u}, - {0x32u, 0x08u}, - {0x33u, 0x80u}, - {0x35u, 0x0Au}, - {0x36u, 0x04u}, - {0x38u, 0x44u}, - {0x3Bu, 0x20u}, - {0x3Cu, 0x54u}, - {0x3Eu, 0x01u}, - {0x40u, 0x42u}, - {0x41u, 0x01u}, - {0x42u, 0x02u}, - {0x58u, 0x80u}, - {0x5Du, 0x40u}, - {0x5Fu, 0x20u}, - {0x63u, 0x02u}, - {0x64u, 0x01u}, - {0x67u, 0x04u}, - {0x6Cu, 0x08u}, - {0x6Du, 0x08u}, - {0x6Fu, 0x32u}, - {0x80u, 0x10u}, - {0x81u, 0x20u}, - {0x87u, 0x4Bu}, - {0x89u, 0x01u}, - {0x8Cu, 0x88u}, - {0x8Du, 0x44u}, - {0x90u, 0x88u}, - {0x91u, 0x19u}, - {0x92u, 0x04u}, - {0x93u, 0x20u}, - {0x94u, 0x02u}, - {0x95u, 0x02u}, - {0x96u, 0x83u}, - {0x97u, 0x86u}, - {0x98u, 0x40u}, - {0x99u, 0x22u}, - {0x9Au, 0xF4u}, - {0x9Bu, 0x48u}, - {0x9Cu, 0x01u}, - {0x9Du, 0x10u}, - {0x9Fu, 0x11u}, - {0xA1u, 0x40u}, - {0xA2u, 0x1Du}, - {0xA3u, 0x50u}, - {0xA5u, 0x38u}, - {0xA7u, 0x0Cu}, - {0xAAu, 0x60u}, - {0xACu, 0x82u}, - {0xB1u, 0x08u}, - {0xB3u, 0x30u}, - {0xB4u, 0x04u}, - {0xB5u, 0x80u}, - {0xB6u, 0x08u}, - {0xC0u, 0xB4u}, - {0xC2u, 0xFEu}, - {0xC4u, 0x57u}, - {0xCAu, 0x7Du}, - {0xCCu, 0xCBu}, - {0xCEu, 0xFEu}, - {0xD6u, 0x38u}, - {0xD8u, 0x38u}, - {0xE0u, 0x14u}, - {0xE4u, 0x08u}, - {0xE6u, 0xD0u}, - {0xE8u, 0x04u}, - {0xEAu, 0x08u}, - {0xEEu, 0x03u}, - {0x00u, 0x40u}, - {0x01u, 0x05u}, - {0x02u, 0x84u}, - {0x03u, 0x02u}, - {0x04u, 0x02u}, - {0x05u, 0x02u}, - {0x06u, 0x01u}, - {0x07u, 0x01u}, - {0x0Du, 0x02u}, - {0x0Fu, 0x01u}, - {0x10u, 0x80u}, - {0x12u, 0x48u}, - {0x14u, 0x10u}, - {0x16u, 0x20u}, - {0x17u, 0x08u}, - {0x18u, 0x01u}, - {0x1Au, 0x02u}, - {0x1Cu, 0x80u}, - {0x1Eu, 0x40u}, - {0x20u, 0x20u}, - {0x22u, 0x10u}, + {0x21u, 0x01u}, + {0x22u, 0x04u}, + {0x23u, 0x20u}, {0x24u, 0x20u}, - {0x26u, 0x10u}, - {0x28u, 0x02u}, - {0x2Au, 0x01u}, - {0x2Cu, 0x04u}, - {0x2Eu, 0x08u}, - {0x30u, 0xC0u}, - {0x31u, 0x03u}, - {0x32u, 0x30u}, + {0x25u, 0x60u}, + {0x27u, 0x80u}, + {0x28u, 0x01u}, + {0x2Du, 0x19u}, + {0x2Fu, 0x09u}, + {0x32u, 0x26u}, {0x33u, 0x08u}, - {0x34u, 0x03u}, - {0x36u, 0x0Cu}, - {0x37u, 0x04u}, - {0x3Au, 0x2Au}, - {0x3Bu, 0x02u}, - {0x3Eu, 0x40u}, - {0x56u, 0x08u}, + {0x37u, 0x11u}, + {0x39u, 0x42u}, + {0x3Au, 0x02u}, + {0x3Bu, 0x10u}, + {0x3Cu, 0x80u}, + {0x3Eu, 0x21u}, + {0x58u, 0x10u}, + {0x59u, 0x04u}, + {0x5Au, 0x42u}, + {0x5Cu, 0x80u}, + {0x60u, 0x04u}, + {0x63u, 0x4Au}, + {0x64u, 0x02u}, + {0x81u, 0x20u}, + {0x87u, 0xC0u}, + {0x88u, 0x80u}, + {0x8Au, 0x04u}, + {0x8Cu, 0x10u}, + {0x90u, 0x82u}, + {0x91u, 0x41u}, + {0x93u, 0x11u}, + {0x94u, 0x04u}, + {0x95u, 0x30u}, + {0x99u, 0xB0u}, + {0x9Au, 0xF0u}, + {0x9Bu, 0x17u}, + {0xA0u, 0x20u}, + {0xA1u, 0x07u}, + {0xA2u, 0x02u}, + {0xA6u, 0x44u}, + {0xA8u, 0x40u}, + {0xA9u, 0x40u}, + {0xAAu, 0x04u}, + {0xABu, 0x08u}, + {0xACu, 0x02u}, + {0xAEu, 0x20u}, + {0xAFu, 0x80u}, + {0xB0u, 0x88u}, + {0xB1u, 0x40u}, + {0xB3u, 0x10u}, + {0xB7u, 0x01u}, + {0xC0u, 0x95u}, + {0xC2u, 0xFBu}, + {0xC4u, 0x8Eu}, + {0xCAu, 0xF8u}, + {0xCCu, 0xA7u}, + {0xCEu, 0xBDu}, + {0xD6u, 0x1Fu}, + {0xD8u, 0x19u}, + {0xE0u, 0x06u}, + {0xEAu, 0x03u}, + {0xEEu, 0x12u}, + {0x00u, 0x0Fu}, + {0x01u, 0x03u}, + {0x02u, 0xF0u}, + {0x03u, 0x0Cu}, + {0x04u, 0x30u}, + {0x06u, 0xC0u}, + {0x07u, 0xFFu}, + {0x08u, 0x05u}, + {0x0Au, 0x0Au}, + {0x0Cu, 0x90u}, + {0x0Du, 0x06u}, + {0x0Eu, 0x60u}, + {0x0Fu, 0x09u}, + {0x11u, 0x60u}, + {0x12u, 0xFFu}, + {0x13u, 0x90u}, + {0x15u, 0x50u}, + {0x17u, 0xA0u}, + {0x19u, 0x30u}, + {0x1Au, 0xFFu}, + {0x1Bu, 0xC0u}, + {0x1Du, 0xFFu}, + {0x1Eu, 0xFFu}, + {0x20u, 0x03u}, + {0x22u, 0x0Cu}, + {0x23u, 0xFFu}, + {0x24u, 0x50u}, + {0x25u, 0x0Fu}, + {0x26u, 0xA0u}, + {0x27u, 0xF0u}, + {0x28u, 0x09u}, + {0x29u, 0x05u}, + {0x2Au, 0x06u}, + {0x2Bu, 0x0Au}, + {0x31u, 0xFFu}, + {0x32u, 0xFFu}, + {0x3Eu, 0x04u}, + {0x3Fu, 0x01u}, {0x58u, 0x04u}, {0x59u, 0x04u}, - {0x5Bu, 0x04u}, - {0x5Cu, 0x99u}, - {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x85u, 0xFFu}, - {0x88u, 0x30u}, - {0x89u, 0x50u}, - {0x8Au, 0xC0u}, - {0x8Bu, 0xA0u}, - {0x8Cu, 0x0Fu}, - {0x8Du, 0x90u}, - {0x8Eu, 0xF0u}, - {0x8Fu, 0x60u}, - {0x90u, 0x05u}, - {0x91u, 0x0Fu}, - {0x92u, 0x0Au}, - {0x93u, 0xF0u}, - {0x94u, 0x06u}, - {0x95u, 0x30u}, - {0x96u, 0x09u}, - {0x97u, 0xC0u}, - {0x99u, 0xFFu}, - {0x9Au, 0xFFu}, - {0x9Cu, 0x03u}, - {0x9Du, 0x05u}, - {0x9Eu, 0x0Cu}, - {0x9Fu, 0x0Au}, - {0xA0u, 0xFFu}, - {0xA1u, 0x03u}, - {0xA3u, 0x0Cu}, - {0xA6u, 0xFFu}, - {0xA7u, 0xFFu}, - {0xA8u, 0x50u}, - {0xA9u, 0x09u}, - {0xAAu, 0xA0u}, - {0xABu, 0x06u}, - {0xACu, 0x60u}, - {0xAEu, 0x90u}, - {0xB3u, 0xFFu}, - {0xB6u, 0xFFu}, - {0xBEu, 0x40u}, - {0xBFu, 0x04u}, + {0x81u, 0x31u}, + {0x82u, 0x07u}, + {0x83u, 0x02u}, + {0x85u, 0xC0u}, + {0x87u, 0x2Cu}, + {0x89u, 0xE4u}, + {0x8Bu, 0x08u}, + {0x8Cu, 0x99u}, + {0x8Du, 0x24u}, + {0x8Eu, 0x22u}, + {0x91u, 0x2Cu}, + {0x93u, 0xC0u}, + {0x94u, 0xAAu}, + {0x95u, 0x11u}, + {0x96u, 0x55u}, + {0x97u, 0x0Eu}, + {0x98u, 0x44u}, + {0x9Au, 0x88u}, + {0x9Bu, 0x2Fu}, + {0x9Du, 0xECu}, + {0x9Eu, 0x70u}, + {0xA2u, 0x08u}, + {0xA3u, 0x80u}, + {0xA5u, 0x08u}, + {0xA6u, 0x80u}, + {0xA7u, 0x10u}, + {0xADu, 0xECu}, + {0xB0u, 0x0Fu}, + {0xB1u, 0x40u}, + {0xB3u, 0x80u}, + {0xB5u, 0x31u}, + {0xB6u, 0xF0u}, + {0xB7u, 0x0Fu}, + {0xBBu, 0x30u}, + {0xBFu, 0x05u}, + {0xD4u, 0x40u}, + {0xD6u, 0x04u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, + {0xDCu, 0x01u}, {0xDFu, 0x01u}, - {0x00u, 0x20u}, - {0x02u, 0x08u}, - {0x03u, 0x01u}, - {0x05u, 0x09u}, - {0x08u, 0x88u}, - {0x09u, 0x80u}, - {0x0Au, 0x40u}, - {0x0Bu, 0x18u}, - {0x0Cu, 0x01u}, - {0x0Eu, 0x26u}, - {0x10u, 0x10u}, - {0x11u, 0x18u}, - {0x12u, 0x82u}, - {0x15u, 0x40u}, - {0x16u, 0x40u}, - {0x17u, 0x18u}, - {0x1Bu, 0x40u}, - {0x1Cu, 0x10u}, - {0x1Du, 0x01u}, - {0x1Eu, 0x25u}, - {0x1Fu, 0x80u}, - {0x23u, 0x20u}, - {0x24u, 0x40u}, - {0x25u, 0x03u}, - {0x27u, 0x12u}, - {0x28u, 0x98u}, - {0x2Cu, 0x08u}, - {0x2Fu, 0x08u}, - {0x30u, 0x80u}, - {0x32u, 0x08u}, - {0x33u, 0x21u}, - {0x35u, 0x08u}, - {0x39u, 0x90u}, - {0x3Bu, 0x08u}, - {0x3Du, 0x82u}, - {0x3Fu, 0x04u}, - {0x41u, 0x04u}, - {0x42u, 0x10u}, - {0x58u, 0x06u}, - {0x5Au, 0x10u}, - {0x5Bu, 0x40u}, - {0x5Fu, 0x40u}, - {0x61u, 0x40u}, - {0x66u, 0x40u}, - {0x67u, 0x02u}, - {0x6Du, 0x40u}, - {0x83u, 0x42u}, - {0x85u, 0x08u}, + {0x01u, 0x02u}, + {0x02u, 0x02u}, + {0x04u, 0x02u}, + {0x05u, 0x20u}, + {0x07u, 0x11u}, + {0x09u, 0x04u}, + {0x0Au, 0x05u}, + {0x0Cu, 0x40u}, + {0x0Eu, 0x80u}, + {0x0Fu, 0x09u}, + {0x10u, 0x20u}, + {0x13u, 0x02u}, + {0x15u, 0x05u}, + {0x17u, 0x24u}, + {0x19u, 0x02u}, + {0x1Au, 0x01u}, + {0x1Eu, 0x10u}, + {0x20u, 0x05u}, + {0x21u, 0x09u}, + {0x22u, 0x91u}, + {0x27u, 0x40u}, + {0x28u, 0x10u}, + {0x29u, 0x40u}, + {0x2Au, 0x05u}, + {0x2Cu, 0x40u}, + {0x2Du, 0x28u}, + {0x32u, 0x18u}, + {0x33u, 0x82u}, + {0x36u, 0x40u}, + {0x37u, 0x15u}, + {0x38u, 0x69u}, + {0x3Cu, 0x80u}, + {0x3Du, 0x01u}, + {0x3Fu, 0x08u}, + {0x45u, 0x80u}, + {0x46u, 0x01u}, + {0x61u, 0x88u}, + {0x62u, 0x20u}, + {0x63u, 0x40u}, + {0x64u, 0x80u}, + {0x65u, 0x02u}, {0x86u, 0x04u}, - {0x89u, 0x10u}, + {0x89u, 0x50u}, + {0x8Au, 0x80u}, {0x8Bu, 0x40u}, - {0x8Cu, 0x10u}, - {0x8Eu, 0x80u}, - {0x8Fu, 0x20u}, - {0x90u, 0x0Cu}, - {0x91u, 0x0Du}, - {0x92u, 0x40u}, - {0x93u, 0x34u}, - {0x94u, 0x42u}, - {0x96u, 0x83u}, - {0x97u, 0x8Au}, - {0x98u, 0x47u}, - {0x99u, 0x60u}, - {0x9Au, 0xB4u}, - {0x9Bu, 0x48u}, - {0x9Du, 0x10u}, - {0x9Fu, 0x01u}, - {0xA0u, 0xC0u}, - {0xA1u, 0x44u}, - {0xA2u, 0x01u}, - {0xA3u, 0x1Cu}, - {0xA5u, 0x18u}, - {0xA7u, 0x80u}, - {0xAFu, 0x24u}, - {0xB1u, 0x04u}, - {0xB3u, 0x10u}, - {0xB4u, 0x80u}, - {0xB6u, 0x40u}, - {0xC0u, 0x33u}, - {0xC2u, 0xFFu}, - {0xC4u, 0xFFu}, - {0xCAu, 0x07u}, - {0xCCu, 0x4Fu}, - {0xCEu, 0xDEu}, - {0xD6u, 0x1Fu}, - {0xD8u, 0x18u}, - {0xE0u, 0x06u}, - {0xE6u, 0x08u}, - {0xEAu, 0x04u}, - {0xECu, 0x08u}, + {0x90u, 0x02u}, + {0x91u, 0x01u}, + {0x93u, 0x01u}, + {0x96u, 0x53u}, + {0x99u, 0xB8u}, + {0x9Au, 0xD2u}, + {0x9Bu, 0x37u}, + {0x9Cu, 0x10u}, + {0x9Du, 0x04u}, + {0x9Fu, 0x40u}, + {0xA0u, 0x20u}, + {0xA1u, 0x45u}, + {0xA2u, 0x02u}, + {0xA6u, 0x40u}, + {0xA7u, 0x24u}, + {0xA8u, 0x01u}, + {0xA9u, 0x18u}, + {0xACu, 0x14u}, + {0xADu, 0x10u}, + {0xAFu, 0x20u}, + {0xB0u, 0x01u}, + {0xB1u, 0x80u}, + {0xB3u, 0x21u}, + {0xB5u, 0x10u}, + {0xB7u, 0x01u}, + {0xC0u, 0xF9u}, + {0xC2u, 0xD7u}, + {0xC4u, 0x7Cu}, + {0xCAu, 0xEBu}, + {0xCCu, 0xFFu}, + {0xCEu, 0xDFu}, + {0xD8u, 0x0Fu}, + {0xE2u, 0x23u}, + {0xE8u, 0x08u}, + {0xEAu, 0x01u}, {0xEEu, 0x02u}, - {0x40u, 0x20u}, - {0x41u, 0x08u}, - {0x81u, 0x01u}, - {0x82u, 0x02u}, - {0x85u, 0x08u}, - {0x87u, 0x41u}, - {0x8Bu, 0x04u}, - {0x8Cu, 0x80u}, - {0x8Du, 0x08u}, - {0x90u, 0x40u}, - {0x93u, 0x40u}, - {0x95u, 0x80u}, - {0x97u, 0x29u}, - {0x99u, 0x28u}, - {0x9Bu, 0x56u}, - {0x9Cu, 0xE0u}, - {0x9Du, 0x81u}, - {0x9Eu, 0x01u}, - {0x9Fu, 0x20u}, - {0xA0u, 0x06u}, - {0xA2u, 0x10u}, - {0xA3u, 0x01u}, - {0xA4u, 0x80u}, - {0xA5u, 0x40u}, - {0xA6u, 0x80u}, - {0xADu, 0x02u}, - {0xB0u, 0x10u}, - {0xB3u, 0x02u}, - {0xB7u, 0x48u}, - {0xE0u, 0x91u}, - {0xE2u, 0x60u}, - {0xE4u, 0x02u}, - {0xEAu, 0x24u}, - {0xECu, 0x40u}, - {0xEEu, 0x82u}, - {0x01u, 0x02u}, - {0x03u, 0x05u}, - {0x07u, 0x10u}, - {0x0Cu, 0x04u}, - {0x0Du, 0x08u}, - {0x0Eu, 0x02u}, - {0x0Fu, 0x10u}, - {0x15u, 0x01u}, - {0x17u, 0x02u}, - {0x18u, 0x01u}, - {0x19u, 0x02u}, - {0x1Bu, 0x01u}, - {0x1Cu, 0x06u}, - {0x1Eu, 0x18u}, - {0x20u, 0x08u}, - {0x22u, 0x10u}, - {0x23u, 0x08u}, - {0x24u, 0x02u}, - {0x26u, 0x04u}, - {0x2Cu, 0x10u}, - {0x2Eu, 0x08u}, - {0x31u, 0x18u}, - {0x32u, 0x1Eu}, - {0x33u, 0x03u}, - {0x35u, 0x04u}, - {0x36u, 0x01u}, - {0x3Bu, 0x08u}, - {0x3Eu, 0x04u}, - {0x3Fu, 0x01u}, - {0x54u, 0x01u}, + {0x80u, 0x02u}, + {0x85u, 0x40u}, + {0x9Cu, 0x02u}, + {0x9Du, 0x08u}, + {0xA1u, 0x40u}, + {0xA2u, 0x04u}, + {0xA9u, 0x40u}, + {0xAEu, 0x01u}, + {0xB1u, 0x01u}, + {0xB3u, 0x31u}, + {0xB5u, 0x20u}, + {0xE2u, 0x01u}, + {0xE4u, 0x20u}, + {0xE6u, 0x01u}, + {0xE8u, 0x08u}, + {0xEAu, 0x20u}, + {0xEEu, 0x20u}, + {0x00u, 0x33u}, + {0x02u, 0xCCu}, + {0x09u, 0xFFu}, + {0x0Au, 0xFFu}, + {0x0Cu, 0xFFu}, + {0x0Du, 0x0Fu}, + {0x0Fu, 0xF0u}, + {0x13u, 0xFFu}, + {0x14u, 0x69u}, + {0x16u, 0x96u}, + {0x17u, 0xFFu}, + {0x1Au, 0xFFu}, + {0x1Bu, 0xFFu}, + {0x1Cu, 0x0Fu}, + {0x1Eu, 0xF0u}, + {0x21u, 0x55u}, + {0x23u, 0xAAu}, + {0x24u, 0xFFu}, + {0x25u, 0x33u}, + {0x27u, 0xCCu}, + {0x28u, 0x55u}, + {0x29u, 0x69u}, + {0x2Au, 0xAAu}, + {0x2Bu, 0x96u}, + {0x2Du, 0xFFu}, + {0x2Eu, 0xFFu}, + {0x36u, 0xFFu}, + {0x37u, 0xFFu}, + {0x3Au, 0x80u}, + {0x3Bu, 0x80u}, + {0x56u, 0x08u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x99u}, - {0x5Du, 0x10u}, + {0x5Cu, 0x11u}, + {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x80u, 0x01u}, - {0x81u, 0x90u}, - {0x83u, 0x60u}, - {0x84u, 0x01u}, - {0x87u, 0xFFu}, - {0x88u, 0x01u}, - {0x89u, 0x09u}, - {0x8Bu, 0x06u}, - {0x8Du, 0x0Fu}, - {0x8Eu, 0x10u}, - {0x8Fu, 0xF0u}, - {0x90u, 0x14u}, - {0x92u, 0x0Au}, - {0x93u, 0xFFu}, - {0x95u, 0x05u}, - {0x96u, 0x0Eu}, - {0x97u, 0x0Au}, - {0x98u, 0x08u}, - {0x99u, 0x03u}, - {0x9Au, 0x10u}, - {0x9Bu, 0x0Cu}, - {0x9Eu, 0x40u}, - {0xA0u, 0x20u}, - {0xA1u, 0x30u}, - {0xA2u, 0x40u}, - {0xA3u, 0xC0u}, - {0xA4u, 0x12u}, - {0xA6u, 0x04u}, - {0xA7u, 0xFFu}, - {0xA9u, 0x50u}, - {0xAAu, 0x20u}, - {0xABu, 0xA0u}, - {0xACu, 0x01u}, - {0xB2u, 0x1Eu}, - {0xB3u, 0xFFu}, - {0xB4u, 0x60u}, - {0xB6u, 0x01u}, - {0xB8u, 0x80u}, - {0xBEu, 0x50u}, - {0xBFu, 0x04u}, + {0x80u, 0xFFu}, + {0x83u, 0x04u}, + {0x86u, 0xFFu}, + {0x87u, 0x7Fu}, + {0x8Cu, 0x96u}, + {0x8Du, 0x20u}, + {0x8Eu, 0x69u}, + {0x8Fu, 0x40u}, + {0x90u, 0x0Fu}, + {0x91u, 0x09u}, + {0x92u, 0xF0u}, + {0x93u, 0x72u}, + {0x96u, 0xFFu}, + {0x99u, 0x74u}, + {0x9Au, 0xFFu}, + {0x9Bu, 0x09u}, + {0x9Du, 0x20u}, + {0x9Fu, 0x40u}, + {0xA0u, 0x33u}, + {0xA1u, 0x08u}, + {0xA2u, 0xCCu}, + {0xA4u, 0x55u}, + {0xA6u, 0xAAu}, + {0xA7u, 0x01u}, + {0xA8u, 0xFFu}, + {0xA9u, 0x01u}, + {0xABu, 0x66u}, + {0xADu, 0x62u}, + {0xB1u, 0x60u}, + {0xB4u, 0xFFu}, + {0xB7u, 0x1Fu}, + {0xBAu, 0x20u}, + {0xBBu, 0x02u}, + {0xD4u, 0x01u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x01u}, + {0xDCu, 0x11u}, + {0xDDu, 0x10u}, {0xDFu, 0x01u}, - {0x00u, 0x40u}, - {0x04u, 0x18u}, - {0x05u, 0x01u}, - {0x07u, 0x01u}, - {0x09u, 0x40u}, - {0x0Au, 0x08u}, - {0x0Bu, 0x04u}, - {0x0Cu, 0x10u}, - {0x0Du, 0x01u}, - {0x0Eu, 0x20u}, - {0x0Fu, 0x01u}, - {0x11u, 0x08u}, - {0x12u, 0x81u}, - {0x15u, 0x90u}, + {0x01u, 0x80u}, + {0x02u, 0x40u}, + {0x03u, 0x08u}, + {0x04u, 0x02u}, + {0x05u, 0x40u}, + {0x07u, 0x20u}, + {0x08u, 0x08u}, + {0x0Au, 0x06u}, + {0x0Du, 0x09u}, + {0x0Eu, 0x04u}, + {0x10u, 0x10u}, + {0x11u, 0x80u}, + {0x12u, 0x04u}, + {0x15u, 0x10u}, {0x16u, 0xA0u}, - {0x19u, 0x08u}, + {0x17u, 0x10u}, {0x1Au, 0x02u}, - {0x1Cu, 0x09u}, - {0x1Du, 0x04u}, - {0x1Eu, 0x20u}, - {0x22u, 0x24u}, - {0x23u, 0x40u}, - {0x24u, 0x10u}, - {0x2Bu, 0x40u}, - {0x2Cu, 0x80u}, - {0x2Du, 0x08u}, - {0x2Fu, 0x04u}, - {0x32u, 0x24u}, - {0x35u, 0x22u}, - {0x37u, 0x08u}, - {0x3Au, 0x82u}, - {0x3Bu, 0x08u}, - {0x3Cu, 0x24u}, - {0x3Du, 0x90u}, - {0x3Eu, 0x80u}, - {0x3Fu, 0x01u}, - {0x58u, 0x40u}, - {0x5Cu, 0xA2u}, - {0x5Fu, 0x04u}, - {0x65u, 0x80u}, - {0x82u, 0x20u}, - {0x86u, 0x02u}, - {0x88u, 0x02u}, - {0x8Cu, 0x05u}, - {0x90u, 0x48u}, - {0x91u, 0x02u}, - {0x94u, 0x04u}, - {0x96u, 0x02u}, - {0x97u, 0x29u}, - {0x98u, 0x10u}, - {0x99u, 0x20u}, - {0x9Bu, 0x57u}, - {0x9Du, 0x0Eu}, - {0x9Eu, 0x20u}, - {0x9Fu, 0x28u}, - {0xA0u, 0x12u}, - {0xA1u, 0x04u}, - {0xA3u, 0x01u}, - {0xA4u, 0x80u}, + {0x1Fu, 0x10u}, + {0x21u, 0x40u}, + {0x24u, 0x80u}, + {0x25u, 0x40u}, + {0x27u, 0x41u}, + {0x28u, 0x20u}, + {0x29u, 0x80u}, + {0x2Bu, 0x44u}, + {0x2Cu, 0x20u}, + {0x2Du, 0x81u}, + {0x2Fu, 0x08u}, + {0x31u, 0x28u}, + {0x33u, 0x09u}, + {0x34u, 0x10u}, + {0x37u, 0x51u}, + {0x39u, 0x90u}, + {0x3Du, 0x02u}, + {0x3Eu, 0x04u}, + {0x3Fu, 0x80u}, + {0x58u, 0x82u}, + {0x59u, 0x28u}, + {0x5Fu, 0x80u}, + {0x60u, 0x20u}, + {0x61u, 0x40u}, + {0x62u, 0x08u}, + {0x63u, 0x88u}, + {0x80u, 0x80u}, + {0x8Bu, 0x80u}, + {0x90u, 0x02u}, + {0x91u, 0x01u}, + {0x92u, 0x04u}, + {0x94u, 0x80u}, + {0x98u, 0x08u}, + {0x99u, 0x80u}, + {0x9Au, 0xE4u}, + {0x9Bu, 0x10u}, + {0xA0u, 0x20u}, + {0xA1u, 0x29u}, + {0xA2u, 0x04u}, {0xA5u, 0x40u}, - {0xA6u, 0x80u}, - {0xA8u, 0x40u}, - {0xA9u, 0x04u}, - {0xABu, 0x02u}, - {0xACu, 0x02u}, - {0xAFu, 0x80u}, - {0xB0u, 0x10u}, - {0xB3u, 0x20u}, - {0xC0u, 0xF1u}, - {0xC2u, 0xF3u}, - {0xC4u, 0xFDu}, - {0xCAu, 0xE1u}, - {0xCCu, 0xE6u}, - {0xCEu, 0xFBu}, - {0xD6u, 0xF8u}, - {0xD8u, 0x10u}, - {0xE0u, 0x20u}, - {0xE2u, 0x40u}, - {0xE4u, 0x40u}, - {0xE6u, 0x80u}, - {0xE8u, 0x21u}, + {0xA6u, 0x08u}, + {0xA7u, 0x04u}, + {0xABu, 0x20u}, + {0xAFu, 0x11u}, + {0xB0u, 0x80u}, + {0xB1u, 0x60u}, + {0xB2u, 0x10u}, + {0xB3u, 0x60u}, + {0xB4u, 0x20u}, + {0xC0u, 0xBBu}, + {0xC2u, 0x77u}, + {0xC4u, 0x77u}, + {0xCAu, 0xFFu}, + {0xCCu, 0xB7u}, + {0xCEu, 0xDCu}, + {0xD6u, 0x1Fu}, + {0xD8u, 0x0Fu}, + {0xE0u, 0x06u}, + {0xE2u, 0x20u}, + {0xE4u, 0x60u}, + {0xE6u, 0x01u}, {0xEAu, 0x80u}, - {0xECu, 0x08u}, - {0xEEu, 0x62u}, - {0x01u, 0x60u}, - {0x03u, 0x90u}, + {0xEEu, 0x30u}, + {0x01u, 0x10u}, + {0x03u, 0x20u}, + {0x04u, 0x20u}, + {0x05u, 0x10u}, {0x06u, 0x10u}, - {0x07u, 0xFFu}, - {0x08u, 0x0Au}, - {0x09u, 0x03u}, - {0x0Au, 0x05u}, - {0x0Bu, 0x0Cu}, - {0x0Du, 0x0Fu}, - {0x0Fu, 0xF0u}, - {0x10u, 0x10u}, - {0x11u, 0xFFu}, - {0x12u, 0x20u}, - {0x15u, 0x05u}, - {0x16u, 0x07u}, - {0x17u, 0x0Au}, - {0x18u, 0x04u}, - {0x19u, 0x06u}, - {0x1Au, 0x08u}, - {0x1Bu, 0x09u}, - {0x21u, 0x30u}, - {0x22u, 0x08u}, - {0x23u, 0xC0u}, - {0x24u, 0x09u}, - {0x26u, 0x02u}, - {0x27u, 0xFFu}, - {0x29u, 0x50u}, - {0x2Au, 0x20u}, - {0x2Bu, 0xA0u}, - {0x32u, 0x0Fu}, - {0x35u, 0xFFu}, - {0x36u, 0x30u}, - {0x3Eu, 0x40u}, - {0x3Fu, 0x10u}, - {0x56u, 0x02u}, - {0x57u, 0x28u}, + {0x07u, 0x20u}, + {0x08u, 0x04u}, + {0x09u, 0x02u}, + {0x0Au, 0x08u}, + {0x0Bu, 0x3Du}, + {0x0Cu, 0x20u}, + {0x0Du, 0x3Cu}, + {0x0Eu, 0x11u}, + {0x0Fu, 0x01u}, + {0x11u, 0x04u}, + {0x13u, 0x08u}, + {0x15u, 0x04u}, + {0x17u, 0x08u}, + {0x18u, 0x10u}, + {0x19u, 0x01u}, + {0x1Au, 0x20u}, + {0x1Bu, 0x02u}, + {0x20u, 0x02u}, + {0x21u, 0x02u}, + {0x23u, 0x3Du}, + {0x26u, 0x08u}, + {0x27u, 0x3Du}, + {0x2Au, 0x04u}, + {0x2Du, 0x3Cu}, + {0x2Fu, 0x01u}, + {0x30u, 0x0Cu}, + {0x32u, 0x01u}, + {0x33u, 0x03u}, + {0x34u, 0x30u}, + {0x35u, 0x30u}, + {0x36u, 0x02u}, + {0x37u, 0x0Cu}, + {0x3Au, 0x20u}, + {0x3Bu, 0xA8u}, + {0x3Eu, 0x01u}, + {0x56u, 0x08u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x01u}, + {0x5Cu, 0x19u}, + {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x81u, 0x28u}, - {0x83u, 0x14u}, - {0x86u, 0x08u}, - {0x87u, 0x20u}, - {0x89u, 0x24u}, - {0x8Au, 0x07u}, - {0x8Bu, 0x08u}, - {0x8Cu, 0x0Au}, - {0x8Eu, 0x05u}, - {0x8Fu, 0x1Cu}, - {0x94u, 0x09u}, - {0x96u, 0x02u}, - {0x98u, 0x04u}, - {0x99u, 0x10u}, - {0x9Au, 0x08u}, - {0x9Bu, 0x20u}, - {0x9Cu, 0x10u}, - {0x9Eu, 0x20u}, + {0x80u, 0x08u}, + {0x82u, 0x04u}, + {0x84u, 0x04u}, + {0x85u, 0x02u}, + {0x86u, 0x09u}, + {0x87u, 0x05u}, + {0x90u, 0x08u}, + {0x92u, 0x16u}, + {0x99u, 0x02u}, + {0x9Bu, 0x01u}, + {0x9Du, 0x01u}, {0x9Fu, 0x02u}, - {0xA1u, 0x01u}, - {0xA2u, 0x20u}, - {0xA3u, 0x02u}, - {0xA6u, 0x10u}, - {0xABu, 0x01u}, - {0xB0u, 0x30u}, - {0xB1u, 0x3Cu}, - {0xB2u, 0x0Fu}, - {0xB3u, 0x03u}, - {0xBEu, 0x01u}, - {0xBFu, 0x04u}, + {0xACu, 0x01u}, + {0xAEu, 0x02u}, + {0xB0u, 0x10u}, + {0xB4u, 0x0Cu}, + {0xB5u, 0x04u}, + {0xB6u, 0x03u}, + {0xB7u, 0x03u}, + {0xBAu, 0x20u}, + {0xBBu, 0x80u}, + {0xBEu, 0x40u}, {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x11u}, + {0xDCu, 0x99u}, {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x00u, 0x18u}, - {0x01u, 0x20u}, - {0x02u, 0x01u}, - {0x05u, 0x04u}, - {0x06u, 0x08u}, - {0x08u, 0x10u}, - {0x09u, 0x40u}, - {0x0Bu, 0x10u}, - {0x0Cu, 0x10u}, - {0x0Eu, 0x20u}, - {0x0Fu, 0x80u}, - {0x11u, 0x08u}, - {0x12u, 0x80u}, - {0x16u, 0xA0u}, - {0x17u, 0x20u}, - {0x18u, 0x90u}, - {0x1Cu, 0x20u}, - {0x1Eu, 0x20u}, - {0x1Fu, 0x80u}, - {0x20u, 0x40u}, - {0x22u, 0x08u}, - {0x24u, 0x08u}, - {0x29u, 0x20u}, - {0x2Bu, 0x40u}, - {0x2Cu, 0x80u}, - {0x2Du, 0x08u}, - {0x2Fu, 0x04u}, - {0x30u, 0x90u}, - {0x35u, 0x02u}, - {0x36u, 0x10u}, - {0x37u, 0x08u}, - {0x38u, 0x40u}, - {0x39u, 0x06u}, - {0x3Au, 0x21u}, - {0x3Bu, 0x10u}, - {0x3Cu, 0x14u}, - {0x3Du, 0x80u}, - {0x3Fu, 0x81u}, - {0x58u, 0x80u}, - {0x63u, 0x02u}, - {0x67u, 0x20u}, - {0x6Cu, 0x02u}, - {0x6Du, 0x01u}, - {0x6Fu, 0x74u}, - {0x77u, 0x02u}, + {0x01u, 0x02u}, + {0x03u, 0x20u}, + {0x05u, 0x54u}, + {0x08u, 0x02u}, + {0x0Eu, 0x04u}, + {0x10u, 0x02u}, + {0x15u, 0x12u}, + {0x17u, 0x04u}, + {0x18u, 0x02u}, + {0x19u, 0x82u}, + {0x1Bu, 0x60u}, + {0x1Cu, 0x80u}, + {0x1Du, 0x24u}, + {0x1Eu, 0x04u}, + {0x1Fu, 0x50u}, + {0x22u, 0xA0u}, + {0x27u, 0x29u}, + {0x2Du, 0x80u}, + {0x2Eu, 0x02u}, + {0x2Fu, 0x10u}, + {0x32u, 0xA0u}, + {0x36u, 0x08u}, + {0x37u, 0x21u}, + {0x38u, 0x04u}, + {0x3Cu, 0x20u}, + {0x3Eu, 0x41u}, + {0x3Fu, 0x08u}, + {0x45u, 0x40u}, + {0x46u, 0x02u}, + {0x5Au, 0xA8u}, + {0x5Du, 0x20u}, + {0x5Fu, 0x40u}, + {0x60u, 0x0Au}, + {0x62u, 0x04u}, + {0x66u, 0xA0u}, + {0x68u, 0x02u}, + {0x6Cu, 0x20u}, + {0x6Fu, 0x0Au}, + {0x79u, 0x10u}, + {0x7Au, 0x04u}, + {0x81u, 0x10u}, {0x83u, 0x04u}, - {0x85u, 0x01u}, - {0x89u, 0x01u}, - {0x8Au, 0x08u}, - {0x91u, 0x04u}, - {0x96u, 0x02u}, - {0x98u, 0x80u}, - {0x9Au, 0x80u}, - {0x9Bu, 0x01u}, - {0xA0u, 0x04u}, - {0xA6u, 0x08u}, - {0xABu, 0x80u}, - {0xAEu, 0x09u}, - {0xB3u, 0x01u}, - {0xB4u, 0x80u}, - {0xC0u, 0x67u}, - {0xC2u, 0x77u}, - {0xC4u, 0x7Cu}, - {0xCAu, 0xE5u}, + {0x86u, 0x80u}, + {0x87u, 0x0Au}, + {0x88u, 0x40u}, + {0x89u, 0x20u}, + {0x8Au, 0x01u}, + {0x8Bu, 0x08u}, + {0x8Cu, 0x40u}, + {0x8Du, 0x01u}, + {0x8Eu, 0x10u}, + {0x90u, 0x04u}, + {0x91u, 0x03u}, + {0x92u, 0xC8u}, + {0x94u, 0x02u}, + {0x97u, 0xA0u}, + {0x99u, 0x40u}, + {0x9Au, 0x40u}, + {0x9Bu, 0x10u}, + {0x9Cu, 0x08u}, + {0x9Eu, 0xB4u}, + {0xA0u, 0x10u}, + {0xA1u, 0x08u}, + {0xA2u, 0x04u}, + {0xA4u, 0xA0u}, + {0xA7u, 0x40u}, + {0xAAu, 0x78u}, + {0xADu, 0x01u}, + {0xAFu, 0x04u}, + {0xB1u, 0x01u}, + {0xB2u, 0x04u}, + {0xB5u, 0x80u}, + {0xB6u, 0x50u}, + {0xC0u, 0xECu}, + {0xC2u, 0x48u}, + {0xC4u, 0x71u}, + {0xCAu, 0xD0u}, {0xCCu, 0xECu}, - {0xCEu, 0xFFu}, - {0xD6u, 0x08u}, - {0xD8u, 0x48u}, - {0xE0u, 0x20u}, - {0xE6u, 0x40u}, - {0xE8u, 0x08u}, - {0xEAu, 0xA0u}, - {0xECu, 0x20u}, - {0xEEu, 0x80u}, - {0xB9u, 0x02u}, - {0xBFu, 0x01u}, - {0xD9u, 0x04u}, - {0xDFu, 0x01u}, - {0x27u, 0x80u}, - {0x82u, 0x80u}, - {0x84u, 0x04u}, - {0x89u, 0x04u}, - {0xE0u, 0x20u}, - {0xE2u, 0x40u}, - {0xE4u, 0x40u}, - {0x80u, 0x30u}, - {0x82u, 0xC0u}, - {0x83u, 0x08u}, - {0x84u, 0x03u}, - {0x85u, 0x09u}, - {0x86u, 0x0Cu}, - {0x87u, 0x02u}, - {0x88u, 0x60u}, - {0x8Au, 0x90u}, - {0x8Cu, 0x0Fu}, - {0x8Eu, 0xF0u}, - {0x91u, 0x10u}, - {0x93u, 0x20u}, - {0x94u, 0x50u}, - {0x96u, 0xA0u}, - {0x98u, 0x06u}, - {0x9Au, 0x09u}, - {0x9Bu, 0x17u}, - {0x9Cu, 0x05u}, - {0x9Eu, 0x0Au}, - {0x9Fu, 0x20u}, - {0xA5u, 0x04u}, - {0xA7u, 0x08u}, - {0xA9u, 0x0Au}, - {0xABu, 0x05u}, - {0xB2u, 0xFFu}, - {0xB3u, 0x0Fu}, - {0xB7u, 0x30u}, - {0xBEu, 0x04u}, - {0xBFu, 0x40u}, - {0xD8u, 0x04u}, - {0xD9u, 0x04u}, - {0xDCu, 0x10u}, - {0xDFu, 0x01u}, - {0x01u, 0x08u}, + {0xCEu, 0xF2u}, + {0xD6u, 0x3Eu}, + {0xD8u, 0x3Eu}, + {0xE0u, 0x10u}, + {0xE2u, 0x02u}, + {0xE6u, 0x90u}, + {0xE8u, 0x20u}, + {0xECu, 0x80u}, + {0xEEu, 0x20u}, + {0x01u, 0x40u}, {0x03u, 0x80u}, - {0x05u, 0x10u}, - {0x07u, 0x91u}, + {0x05u, 0xD3u}, + {0x07u, 0x20u}, {0x09u, 0x08u}, - {0x0Au, 0x82u}, - {0x0Eu, 0x10u}, - {0x0Fu, 0x0Au}, - {0x11u, 0x20u}, - {0x1Au, 0x80u}, - {0x1Bu, 0x80u}, - {0x1Fu, 0x04u}, - {0x21u, 0xC8u}, - {0x22u, 0x09u}, - {0x23u, 0x40u}, - {0x25u, 0x40u}, - {0x27u, 0x10u}, - {0x29u, 0x81u}, - {0x2Au, 0x24u}, - {0x2Cu, 0x08u}, - {0x2Fu, 0x10u}, - {0x31u, 0x88u}, - {0x32u, 0x01u}, - {0x37u, 0x91u}, - {0x39u, 0x04u}, - {0x3Au, 0x80u}, - {0x3Bu, 0x01u}, - {0x3Cu, 0x04u}, - {0x3Du, 0x01u}, - {0x40u, 0x08u}, - {0x41u, 0x08u}, - {0x42u, 0x80u}, - {0x48u, 0x80u}, - {0x49u, 0x28u}, - {0x4Bu, 0x41u}, - {0x51u, 0x20u}, - {0x52u, 0x81u}, - {0x53u, 0x40u}, - {0x6Bu, 0x01u}, - {0x80u, 0x40u}, - {0x81u, 0x30u}, - {0x82u, 0x81u}, - {0x85u, 0x08u}, - {0x88u, 0x88u}, - {0x8Au, 0x01u}, - {0x8Du, 0x40u}, - {0x8Eu, 0x08u}, - {0x90u, 0x04u}, - {0x91u, 0x05u}, - {0x92u, 0x10u}, - {0x93u, 0x20u}, - {0x94u, 0x80u}, - {0x96u, 0x82u}, - {0x97u, 0x88u}, - {0x99u, 0x91u}, - {0x9Au, 0x24u}, - {0x9Bu, 0x80u}, - {0x9Fu, 0x01u}, - {0xA0u, 0x08u}, - {0xA3u, 0x05u}, - {0xA5u, 0x78u}, - {0xA6u, 0x80u}, - {0xAAu, 0x02u}, - {0xACu, 0x10u}, - {0xAFu, 0x81u}, - {0xB3u, 0x01u}, - {0xB4u, 0xC0u}, - {0xB6u, 0x10u}, - {0xC0u, 0xFCu}, - {0xC2u, 0xEDu}, - {0xC4u, 0x02u}, - {0xCAu, 0x6Fu}, - {0xCCu, 0xBBu}, - {0xCEu, 0xCBu}, - {0xD0u, 0x07u}, - {0xD2u, 0x0Cu}, - {0xE0u, 0x04u}, - {0xE2u, 0x01u}, - {0xE4u, 0x08u}, - {0xE8u, 0x0Au}, - {0xEAu, 0x40u}, - {0xECu, 0x0Cu}, - {0x00u, 0x33u}, - {0x01u, 0x0Fu}, - {0x02u, 0xCCu}, - {0x03u, 0xF0u}, - {0x04u, 0x55u}, - {0x06u, 0xAAu}, - {0x07u, 0xFFu}, - {0x0Cu, 0x0Fu}, - {0x0Eu, 0xF0u}, - {0x12u, 0xFFu}, - {0x13u, 0xFFu}, - {0x14u, 0xFFu}, - {0x15u, 0xFFu}, - {0x1Au, 0xFFu}, - {0x1Cu, 0xFFu}, - {0x1Du, 0x55u}, - {0x1Fu, 0xAAu}, - {0x21u, 0xFFu}, - {0x24u, 0x69u}, - {0x26u, 0x96u}, - {0x27u, 0xFFu}, - {0x29u, 0x96u}, - {0x2Au, 0xFFu}, - {0x2Bu, 0x69u}, - {0x2Du, 0x33u}, - {0x2Fu, 0xCCu}, - {0x31u, 0xFFu}, - {0x36u, 0xFFu}, - {0x3Au, 0x80u}, - {0x3Bu, 0x02u}, + {0x0Bu, 0xC3u}, + {0x0Du, 0x01u}, + {0x0Fu, 0x02u}, + {0x15u, 0x14u}, + {0x17u, 0xE3u}, + {0x1Bu, 0x04u}, + {0x21u, 0xC3u}, + {0x23u, 0x20u}, + {0x25u, 0x01u}, + {0x26u, 0x01u}, + {0x27u, 0x02u}, + {0x29u, 0x04u}, + {0x2Bu, 0xE3u}, + {0x2Du, 0x40u}, + {0x2Fu, 0x80u}, + {0x33u, 0x3Cu}, + {0x34u, 0x01u}, + {0x35u, 0xC0u}, + {0x37u, 0x03u}, + {0x39u, 0x08u}, + {0x3Bu, 0xA0u}, {0x56u, 0x08u}, {0x58u, 0x04u}, {0x59u, 0x04u}, {0x5Bu, 0x04u}, - {0x5Cu, 0x11u}, + {0x5Cu, 0x19u}, {0x5Du, 0x90u}, {0x5Fu, 0x01u}, - {0x81u, 0x0Cu}, - {0x82u, 0x70u}, - {0x84u, 0x10u}, - {0x86u, 0x2Fu}, - {0x8Cu, 0x03u}, - {0x8Du, 0x03u}, - {0x8Eu, 0x0Cu}, - {0x8Fu, 0x08u}, - {0x91u, 0x03u}, - {0x93u, 0x04u}, - {0x94u, 0x0Fu}, - {0x95u, 0x05u}, - {0x97u, 0x02u}, - {0x98u, 0x40u}, - {0x9Au, 0x1Fu}, - {0xA0u, 0x06u}, - {0xA2u, 0x09u}, - {0xA8u, 0x20u}, - {0xAAu, 0x4Fu}, - {0xACu, 0x05u}, - {0xAEu, 0x0Au}, - {0xB1u, 0x0Eu}, - {0xB5u, 0x01u}, - {0xB6u, 0x7Fu}, - {0xB9u, 0x02u}, - {0xBFu, 0x10u}, - {0xD4u, 0x40u}, - {0xD6u, 0x04u}, + {0x80u, 0xF0u}, + {0x83u, 0x09u}, + {0x84u, 0x04u}, + {0x86u, 0xF8u}, + {0x88u, 0xFAu}, + {0x89u, 0x40u}, + {0x8Au, 0x05u}, + {0x8Bu, 0x80u}, + {0x8Du, 0xE0u}, + {0x91u, 0x06u}, + {0x92u, 0x08u}, + {0x93u, 0xF8u}, + {0x94u, 0x40u}, + {0x95u, 0xC6u}, + {0x96u, 0x80u}, + {0x97u, 0x19u}, + {0x99u, 0x09u}, + {0x9Au, 0x07u}, + {0x9Bu, 0xF2u}, + {0x9Eu, 0xF0u}, + {0xA0u, 0x09u}, + {0xA2u, 0xF2u}, + {0xA3u, 0xFFu}, + {0xA4u, 0x40u}, + {0xA5u, 0x01u}, + {0xA6u, 0x80u}, + {0xA8u, 0x10u}, + {0xA9u, 0x14u}, + {0xAAu, 0x20u}, + {0xACu, 0x10u}, + {0xADu, 0x40u}, + {0xAEu, 0x20u}, + {0xAFu, 0x80u}, + {0xB2u, 0xC0u}, + {0xB3u, 0x3Fu}, + {0xB4u, 0x0Fu}, + {0xB5u, 0xC0u}, + {0xB6u, 0x30u}, + {0xBAu, 0x88u}, + {0xBBu, 0x20u}, + {0xD6u, 0x08u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, {0xDBu, 0x04u}, - {0xDCu, 0x01u}, + {0xDCu, 0x11u}, + {0xDDu, 0x90u}, {0xDFu, 0x01u}, - {0x00u, 0x84u}, - {0x03u, 0x90u}, - {0x04u, 0x08u}, - {0x05u, 0x40u}, - {0x06u, 0x81u}, - {0x09u, 0x04u}, - {0x0Au, 0x04u}, - {0x0Cu, 0x09u}, - {0x0Du, 0x02u}, - {0x0Eu, 0x05u}, - {0x10u, 0x0Cu}, - {0x11u, 0x02u}, - {0x12u, 0x01u}, - {0x16u, 0x10u}, - {0x17u, 0x10u}, - {0x1Bu, 0x80u}, - {0x1Du, 0x40u}, - {0x21u, 0x01u}, - {0x22u, 0x10u}, - {0x25u, 0x01u}, - {0x2Du, 0x20u}, - {0x2Eu, 0x05u}, - {0x2Fu, 0x11u}, + {0x04u, 0x02u}, + {0x06u, 0x18u}, + {0x0Cu, 0x81u}, + {0x0Eu, 0x18u}, + {0x13u, 0x04u}, + {0x14u, 0x08u}, + {0x15u, 0x40u}, + {0x16u, 0x20u}, + {0x17u, 0x01u}, + {0x1Au, 0x04u}, + {0x1Eu, 0x18u}, + {0x1Fu, 0x80u}, + {0x20u, 0x20u}, + {0x21u, 0x48u}, + {0x23u, 0x2Au}, + {0x25u, 0x10u}, + {0x26u, 0x28u}, + {0x27u, 0x10u}, + {0x29u, 0x10u}, + {0x2Au, 0x54u}, + {0x2Bu, 0x40u}, + {0x2Cu, 0xA0u}, + {0x2Eu, 0x80u}, + {0x2Fu, 0x08u}, + {0x30u, 0x20u}, {0x31u, 0x08u}, - {0x32u, 0x01u}, - {0x34u, 0x45u}, - {0x38u, 0x82u}, - {0x39u, 0x02u}, - {0x3Cu, 0x04u}, - {0x3Du, 0x02u}, - {0x5Cu, 0x80u}, - {0x60u, 0x40u}, - {0x61u, 0x20u}, - {0x62u, 0x80u}, - {0x63u, 0x20u}, - {0x67u, 0x02u}, - {0x68u, 0x90u}, - {0x69u, 0x90u}, - {0x71u, 0x10u}, - {0x72u, 0x12u}, - {0x73u, 0x80u}, - {0x81u, 0x41u}, - {0x82u, 0x02u}, - {0x85u, 0x40u}, - {0x8Cu, 0x80u}, - {0x8Eu, 0x10u}, - {0x90u, 0x0Cu}, - {0x91u, 0x05u}, - {0x92u, 0x01u}, - {0x93u, 0x20u}, - {0x94u, 0x02u}, - {0x95u, 0x90u}, - {0x96u, 0x82u}, - {0x97u, 0x88u}, - {0x98u, 0x40u}, - {0x99u, 0xA0u}, - {0x9Au, 0xB4u}, - {0x9Du, 0x10u}, - {0x9Fu, 0x01u}, - {0xA0u, 0x48u}, - {0xA1u, 0x06u}, - {0xA3u, 0x14u}, - {0xA4u, 0x10u}, - {0xA5u, 0x18u}, - {0xA6u, 0x02u}, - {0xA9u, 0x81u}, - {0xB5u, 0x80u}, - {0xB7u, 0x20u}, - {0xC0u, 0xBDu}, - {0xC2u, 0xF6u}, - {0xC4u, 0x6Bu}, - {0xCAu, 0xF0u}, - {0xCCu, 0xD3u}, - {0xCEu, 0xC9u}, - {0xD6u, 0x10u}, - {0xD8u, 0x1Fu}, - {0xE0u, 0x03u}, - {0xE2u, 0x0Cu}, - {0xE8u, 0x04u}, - {0xEEu, 0x09u}, - {0x80u, 0x02u}, - {0x83u, 0x01u}, + {0x35u, 0x10u}, + {0x36u, 0x08u}, + {0x37u, 0x01u}, + {0x39u, 0x80u}, + {0x3Au, 0x09u}, + {0x3Bu, 0x20u}, + {0x3Du, 0x21u}, + {0x3Fu, 0x80u}, + {0x42u, 0x08u}, + {0x43u, 0x10u}, + {0x59u, 0x80u}, + {0x5Au, 0x20u}, + {0x5Cu, 0x50u}, + {0x60u, 0x04u}, + {0x62u, 0x40u}, + {0x65u, 0x40u}, + {0x67u, 0x04u}, + {0x81u, 0x40u}, + {0x82u, 0x01u}, + {0x83u, 0x88u}, + {0x87u, 0x63u}, + {0x88u, 0x01u}, + {0x8Au, 0x04u}, + {0x8Bu, 0x08u}, + {0x8Cu, 0x50u}, + {0xC0u, 0x70u}, + {0xC2u, 0xF0u}, + {0xC4u, 0xF4u}, + {0xCAu, 0xFFu}, + {0xCCu, 0xE6u}, + {0xCEu, 0xBFu}, + {0xD6u, 0x3Cu}, + {0xD8u, 0x3Cu}, + {0xE0u, 0x70u}, + {0xE4u, 0x20u}, + {0x80u, 0x09u}, + {0x81u, 0x01u}, + {0x82u, 0x02u}, + {0x83u, 0x32u}, + {0x84u, 0x22u}, + {0x85u, 0x62u}, + {0x86u, 0x01u}, + {0x87u, 0x08u}, + {0x89u, 0x0Du}, + {0x8Du, 0x0Du}, + {0x90u, 0x3Eu}, + {0x94u, 0x01u}, + {0x95u, 0x02u}, + {0x96u, 0x14u}, + {0x97u, 0x54u}, + {0x9Bu, 0x10u}, + {0x9Du, 0x02u}, + {0x9Fu, 0x0Du}, + {0xA1u, 0x0Du}, + {0xA5u, 0x0Du}, + {0xAAu, 0x38u}, + {0xADu, 0x0Du}, + {0xB0u, 0x07u}, + {0xB3u, 0x70u}, + {0xB4u, 0x38u}, + {0xB7u, 0x0Fu}, + {0xB8u, 0x02u}, + {0xBBu, 0x80u}, + {0xBEu, 0x10u}, + {0xD8u, 0x04u}, + {0xD9u, 0x04u}, + {0xDFu, 0x01u}, + {0x01u, 0xA0u}, + {0x02u, 0x40u}, + {0x04u, 0x05u}, + {0x08u, 0x80u}, + {0x09u, 0x01u}, + {0x0Du, 0x08u}, + {0x0Eu, 0x80u}, + {0x11u, 0x04u}, + {0x13u, 0x40u}, + {0x17u, 0x10u}, + {0x1Au, 0x04u}, + {0x1Bu, 0x05u}, + {0x1Eu, 0x80u}, + {0x1Fu, 0x20u}, + {0x21u, 0x02u}, + {0x26u, 0x80u}, + {0x27u, 0x20u}, + {0x29u, 0x40u}, + {0x2Au, 0x20u}, + {0x2Bu, 0x80u}, + {0x2Cu, 0x20u}, + {0x2Fu, 0x82u}, + {0x31u, 0x88u}, + {0x32u, 0x10u}, + {0x33u, 0x02u}, + {0x36u, 0x88u}, + {0x37u, 0x20u}, + {0x38u, 0x69u}, + {0x3Cu, 0x85u}, + {0x3Eu, 0x10u}, + {0x40u, 0x05u}, + {0x41u, 0x09u}, + {0x49u, 0x06u}, + {0x4Au, 0x04u}, + {0x52u, 0x25u}, + {0x53u, 0x40u}, + {0x83u, 0x20u}, + {0x86u, 0x24u}, {0x87u, 0x40u}, - {0x8Fu, 0x01u}, - {0x90u, 0x40u}, - {0x97u, 0x21u}, - {0x9Bu, 0x56u}, - {0x9Cu, 0x40u}, - {0x9Eu, 0x01u}, - {0x9Fu, 0x20u}, - {0xA0u, 0x06u}, - {0xA2u, 0x10u}, - {0xA4u, 0x80u}, - {0xA5u, 0x40u}, - {0xA6u, 0x82u}, - {0xA9u, 0xA0u}, - {0xB5u, 0x40u}, - {0xB7u, 0x10u}, + {0x8Bu, 0x20u}, + {0x8Eu, 0x04u}, + {0x90u, 0x6Du}, + {0x91u, 0x06u}, + {0x92u, 0x30u}, + {0x93u, 0x40u}, + {0x98u, 0x80u}, + {0x99u, 0xE0u}, + {0x9Au, 0x40u}, + {0x9Bu, 0x10u}, + {0x9Du, 0x06u}, + {0x9Eu, 0x05u}, + {0xA0u, 0x60u}, + {0xA1u, 0x89u}, + {0xA2u, 0x08u}, + {0xA3u, 0x82u}, + {0xA5u, 0x02u}, + {0xA6u, 0x20u}, + {0xA7u, 0x05u}, + {0xB3u, 0x01u}, + {0xC0u, 0x3Bu}, + {0xC2u, 0x39u}, + {0xC4u, 0x45u}, + {0xCAu, 0xDDu}, + {0xCCu, 0x7Fu}, + {0xCEu, 0xFFu}, + {0xD0u, 0x0Fu}, + {0xD2u, 0x04u}, {0xE0u, 0x42u}, - {0xE2u, 0x10u}, - {0xECu, 0x10u}, - {0xEEu, 0x48u}, - {0x00u, 0x01u}, - {0x04u, 0x01u}, - {0x08u, 0x07u}, - {0x0Au, 0x18u}, - {0x0Cu, 0x22u}, - {0x0Eu, 0x08u}, - {0x0Fu, 0x01u}, - {0x11u, 0x04u}, - {0x14u, 0x08u}, - {0x16u, 0x21u}, - {0x18u, 0x10u}, - {0x19u, 0x01u}, - {0x1Bu, 0x02u}, - {0x1Cu, 0x04u}, - {0x20u, 0x01u}, - {0x23u, 0x02u}, - {0x25u, 0x04u}, - {0x28u, 0x01u}, - {0x2Cu, 0x01u}, - {0x31u, 0x03u}, - {0x32u, 0x3Fu}, - {0x37u, 0x04u}, - {0x38u, 0x08u}, - {0x39u, 0x80u}, - {0x3Eu, 0x04u}, - {0x3Fu, 0x01u}, + {0xE2u, 0x80u}, + {0x00u, 0x0Fu}, + {0x01u, 0x11u}, + {0x02u, 0xF0u}, + {0x03u, 0x62u}, + {0x04u, 0x03u}, + {0x05u, 0x58u}, + {0x06u, 0x0Cu}, + {0x07u, 0x23u}, + {0x08u, 0x60u}, + {0x09u, 0x40u}, + {0x0Au, 0x90u}, + {0x0Bu, 0x30u}, + {0x0Cu, 0x05u}, + {0x0Eu, 0x0Au}, + {0x13u, 0x01u}, + {0x15u, 0x34u}, + {0x17u, 0x43u}, + {0x1Bu, 0x0Cu}, + {0x1Cu, 0x06u}, + {0x1Eu, 0x09u}, + {0x20u, 0x30u}, + {0x22u, 0xC0u}, + {0x23u, 0x82u}, + {0x24u, 0x50u}, + {0x26u, 0xA0u}, + {0x30u, 0xFFu}, + {0x33u, 0x0Fu}, + {0x35u, 0x70u}, + {0x37u, 0x80u}, + {0x3Bu, 0x20u}, + {0x3Eu, 0x01u}, + {0x56u, 0x02u}, + {0x57u, 0x28u}, {0x58u, 0x04u}, {0x59u, 0x04u}, + {0x5Bu, 0x04u}, {0x5Fu, 0x01u}, - {0x80u, 0x86u}, - {0x83u, 0x60u}, - {0x84u, 0x39u}, - {0x86u, 0x46u}, - {0x88u, 0x17u}, - {0x89u, 0x80u}, - {0x8Au, 0x68u}, - {0x8Cu, 0x51u}, - {0x8Du, 0x7Fu}, - {0x8Eu, 0x2Eu}, - {0x8Fu, 0x80u}, - {0x90u, 0x06u}, - {0x91u, 0xC0u}, - {0x92u, 0x80u}, - {0x93u, 0x01u}, - {0x94u, 0x02u}, - {0x95u, 0xC0u}, - {0x97u, 0x08u}, - {0x98u, 0x40u}, - {0x99u, 0xC0u}, - {0x9Au, 0x30u}, - {0x9Bu, 0x04u}, - {0x9Cu, 0x04u}, - {0x9Du, 0xC0u}, - {0x9Fu, 0x02u}, - {0xA0u, 0x86u}, - {0xA3u, 0x9Fu}, - {0xA4u, 0x80u}, - {0xA5u, 0x1Fu}, - {0xA6u, 0x06u}, - {0xA7u, 0x20u}, - {0xA8u, 0x82u}, - {0xAAu, 0x04u}, - {0xABu, 0xFFu}, - {0xADu, 0x90u}, - {0xAFu, 0x40u}, + {0x80u, 0x10u}, + {0x81u, 0x16u}, + {0x85u, 0x10u}, + {0x87u, 0x06u}, + {0x88u, 0x47u}, + {0x89u, 0x12u}, + {0x8Au, 0x18u}, + {0x8Bu, 0x04u}, + {0x8Cu, 0x01u}, + {0x8Du, 0x22u}, + {0x8Fu, 0x10u}, + {0x90u, 0x04u}, + {0x91u, 0x40u}, + {0x94u, 0x62u}, + {0x95u, 0x29u}, + {0x96u, 0x08u}, + {0x97u, 0x16u}, + {0x99u, 0x31u}, + {0x9Bu, 0x0Eu}, + {0x9Cu, 0x01u}, + {0x9Du, 0x17u}, + {0x9Fu, 0x28u}, + {0xA0u, 0x01u}, + {0xA1u, 0x16u}, + {0xA4u, 0x01u}, + {0xA5u, 0x04u}, + {0xA8u, 0x48u}, + {0xA9u, 0x40u}, + {0xAAu, 0x21u}, + {0xACu, 0x01u}, + {0xADu, 0x06u}, + {0xAFu, 0x10u}, {0xB0u, 0x08u}, - {0xB2u, 0x0Fu}, - {0xB4u, 0x70u}, - {0xB6u, 0x80u}, - {0xB7u, 0xFFu}, + {0xB1u, 0x30u}, + {0xB2u, 0x3Fu}, + {0xB3u, 0x0Fu}, + {0xB4u, 0x40u}, + {0xB7u, 0x40u}, {0xB8u, 0x08u}, - {0xBAu, 0x20u}, - {0xBEu, 0x41u}, - {0xBFu, 0x40u}, - {0xD4u, 0x09u}, - {0xD6u, 0x04u}, + {0xB9u, 0x88u}, + {0xBBu, 0x02u}, + {0xBEu, 0x15u}, {0xD8u, 0x04u}, {0xD9u, 0x04u}, - {0xDBu, 0x04u}, {0xDFu, 0x01u}, - {0x01u, 0xA0u}, - {0x03u, 0x50u}, - {0x05u, 0x84u}, - {0x06u, 0x08u}, - {0x07u, 0x40u}, - {0x0Au, 0x18u}, - {0x0Bu, 0x01u}, - {0x0Cu, 0x0Au}, - {0x0Eu, 0x09u}, - {0x10u, 0x0Au}, - {0x13u, 0x02u}, - {0x17u, 0x16u}, - {0x19u, 0x08u}, - {0x1Cu, 0x01u}, - {0x1Du, 0x04u}, - {0x1Eu, 0x58u}, - {0x1Fu, 0x90u}, - {0x22u, 0x02u}, - {0x23u, 0x01u}, - {0x27u, 0x01u}, - {0x29u, 0x08u}, - {0x2Au, 0x01u}, - {0x2Cu, 0x02u}, + {0x00u, 0x80u}, + {0x01u, 0x12u}, + {0x04u, 0x02u}, + {0x05u, 0x18u}, + {0x06u, 0x02u}, + {0x09u, 0x40u}, + {0x0Au, 0xA0u}, + {0x0Eu, 0x01u}, + {0x10u, 0x20u}, + {0x11u, 0x01u}, + {0x12u, 0x0Au}, + {0x16u, 0x90u}, + {0x1Au, 0x40u}, + {0x1Bu, 0x28u}, + {0x1Eu, 0x80u}, + {0x20u, 0x40u}, + {0x21u, 0x88u}, + {0x22u, 0x4Au}, + {0x25u, 0x10u}, + {0x27u, 0x12u}, + {0x28u, 0x40u}, + {0x2Au, 0x04u}, + {0x2Bu, 0x0Au}, {0x2Du, 0x02u}, - {0x2Eu, 0x18u}, - {0x30u, 0x20u}, - {0x33u, 0x01u}, - {0x37u, 0x56u}, - {0x38u, 0x40u}, + {0x31u, 0x0Au}, + {0x32u, 0x90u}, + {0x36u, 0x08u}, + {0x37u, 0x12u}, + {0x38u, 0x68u}, + {0x39u, 0x01u}, + {0x3Cu, 0x05u}, {0x3Du, 0x20u}, - {0x3Fu, 0x81u}, - {0x44u, 0x20u}, - {0x47u, 0x08u}, - {0x5Cu, 0x25u}, - {0x5Eu, 0x40u}, - {0x67u, 0x82u}, - {0x80u, 0x04u}, - {0x82u, 0x10u}, - {0x85u, 0x02u}, - {0x86u, 0x04u}, - {0x89u, 0x20u}, - {0x8Au, 0x09u}, - {0x8Bu, 0x88u}, - {0x8Cu, 0x08u}, - {0x8Du, 0x90u}, - {0x8Fu, 0x40u}, - {0x90u, 0x40u}, - {0x93u, 0x02u}, - {0x97u, 0xA0u}, - {0x9Au, 0x01u}, - {0x9Bu, 0x56u}, - {0xA0u, 0x22u}, - {0xA6u, 0x02u}, - {0xAAu, 0x80u}, - {0xACu, 0xE0u}, - {0xADu, 0x40u}, - {0xB0u, 0x04u}, - {0xB2u, 0x10u}, - {0xB6u, 0x01u}, - {0xB7u, 0x20u}, - {0xC0u, 0xFFu}, - {0xC2u, 0xF7u}, - {0xC4u, 0x7Bu}, - {0xCAu, 0xF3u}, - {0xCCu, 0xF5u}, - {0xCEu, 0xB8u}, - {0xD6u, 0xF0u}, - {0xD8u, 0x90u}, - {0xE0u, 0x20u}, - {0xE2u, 0x80u}, - {0xE4u, 0xD0u}, - {0xEAu, 0x80u}, - {0xECu, 0x50u}, + {0x45u, 0x10u}, + {0x46u, 0x08u}, + {0x4Cu, 0x01u}, + {0x4Fu, 0x40u}, + {0x58u, 0x40u}, + {0x59u, 0x40u}, + {0x66u, 0x08u}, + {0x6Cu, 0x34u}, + {0x6Du, 0x81u}, + {0x6Eu, 0x10u}, + {0x6Fu, 0x82u}, + {0x74u, 0x40u}, + {0x75u, 0x40u}, + {0x8Du, 0x08u}, + {0x90u, 0x07u}, + {0x91u, 0x16u}, + {0x92u, 0x21u}, + {0x94u, 0x68u}, + {0x96u, 0x40u}, + {0x98u, 0x80u}, + {0x99u, 0xB0u}, + {0x9Au, 0xD2u}, + {0x9Du, 0x44u}, + {0x9Eu, 0x05u}, + {0xA1u, 0x01u}, + {0xA2u, 0x80u}, + {0xA6u, 0x68u}, + {0xA7u, 0xA6u}, + {0xB0u, 0x40u}, + {0xB3u, 0x20u}, + {0xC0u, 0xFBu}, + {0xC2u, 0x8Du}, + {0xC4u, 0x3Fu}, + {0xCAu, 0x8Fu}, + {0xCCu, 0xEFu}, + {0xCEu, 0xEFu}, + {0xD8u, 0x40u}, + {0xE2u, 0x08u}, + {0xEAu, 0x02u}, + {0xEEu, 0x08u}, + {0x38u, 0x80u}, + {0x3Eu, 0x40u}, + {0x58u, 0x04u}, + {0x5Fu, 0x01u}, + {0x1Fu, 0x40u}, + {0x87u, 0x40u}, + {0x8Eu, 0x04u}, + {0x9Du, 0x08u}, + {0xA2u, 0x04u}, + {0xE2u, 0x40u}, + {0xEAu, 0x02u}, + {0xEEu, 0x08u}, + {0x8Du, 0x08u}, + {0x9Du, 0x08u}, + {0xE0u, 0x02u}, + {0xE8u, 0x80u}, {0x04u, 0x10u}, - {0x0Cu, 0x20u}, - {0x13u, 0x20u}, + {0x0Eu, 0x08u}, + {0x12u, 0x08u}, {0x16u, 0x80u}, {0x17u, 0x80u}, - {0x31u, 0x04u}, - {0x34u, 0x02u}, + {0x32u, 0x02u}, {0x36u, 0x80u}, - {0x39u, 0x01u}, + {0x37u, 0x08u}, + {0x39u, 0x04u}, {0x3Au, 0x80u}, - {0x3Eu, 0x10u}, - {0x3Fu, 0x08u}, - {0x42u, 0x01u}, - {0x65u, 0x80u}, - {0x8Eu, 0x10u}, + {0x3Cu, 0x08u}, + {0x3Fu, 0x10u}, + {0x42u, 0x08u}, + {0x66u, 0x40u}, + {0x87u, 0x08u}, + {0x89u, 0x04u}, + {0x8Cu, 0x10u}, + {0x8Eu, 0x06u}, {0xC0u, 0x80u}, {0xC2u, 0x80u}, {0xC4u, 0xE0u}, @@ -1881,194 +1809,161 @@ void cyfitter_cfg(void) {0xCEu, 0xF0u}, {0xD0u, 0x10u}, {0xD6u, 0x80u}, - {0x30u, 0x04u}, - {0x33u, 0x10u}, - {0x35u, 0x01u}, + {0xE2u, 0x10u}, + {0x33u, 0x11u}, + {0x36u, 0x02u}, {0x37u, 0x80u}, - {0x3Bu, 0x40u}, - {0x51u, 0x20u}, - {0x58u, 0x80u}, - {0x62u, 0x02u}, - {0x6Bu, 0x30u}, - {0x83u, 0x01u}, - {0x87u, 0x20u}, - {0x90u, 0x10u}, - {0x96u, 0x01u}, - {0x9Bu, 0xA4u}, - {0x9Du, 0x84u}, - {0xA0u, 0x20u}, + {0x39u, 0x80u}, + {0x50u, 0x04u}, + {0x54u, 0x20u}, + {0x63u, 0x40u}, + {0x86u, 0x42u}, + {0x87u, 0x40u}, + {0x9Bu, 0x90u}, + {0x9Eu, 0x48u}, + {0xA4u, 0x04u}, {0xA6u, 0x80u}, - {0xA7u, 0x04u}, - {0xABu, 0x04u}, - {0xACu, 0x02u}, - {0xADu, 0x01u}, + {0xAAu, 0x08u}, + {0xABu, 0x10u}, + {0xAFu, 0x10u}, {0xCCu, 0xF0u}, {0xCEu, 0x10u}, - {0xD4u, 0xA0u}, + {0xD4u, 0x60u}, {0xD8u, 0x40u}, - {0xE6u, 0x30u}, - {0xEAu, 0x90u}, - {0xEEu, 0x40u}, + {0xE2u, 0x50u}, + {0xE6u, 0x40u}, + {0xEAu, 0x10u}, {0x12u, 0x80u}, {0x33u, 0x80u}, - {0x5Bu, 0x04u}, - {0x80u, 0x80u}, - {0x85u, 0x80u}, - {0x88u, 0x04u}, - {0x8Cu, 0x10u}, - {0x8Du, 0x20u}, - {0x8Eu, 0x02u}, - {0x90u, 0x10u}, - {0x93u, 0x02u}, - {0x96u, 0x01u}, - {0x97u, 0x40u}, - {0x9Bu, 0x04u}, - {0x9Cu, 0x84u}, - {0x9Du, 0x85u}, - {0xA0u, 0x20u}, - {0xA3u, 0x20u}, - {0xA5u, 0x20u}, - {0xA6u, 0x82u}, - {0xA7u, 0x04u}, + {0x86u, 0x08u}, + {0x95u, 0x80u}, + {0x9Eu, 0x08u}, + {0x9Fu, 0x01u}, + {0xA4u, 0x04u}, + {0xA6u, 0x80u}, + {0xA8u, 0x04u}, + {0xB4u, 0x20u}, {0xC4u, 0x10u}, {0xCCu, 0x10u}, - {0xD6u, 0x40u}, - {0xE2u, 0x10u}, - {0xE6u, 0x80u}, - {0x81u, 0x04u}, - {0x93u, 0x02u}, - {0x96u, 0x01u}, - {0x9Du, 0x04u}, - {0xA3u, 0x20u}, - {0xA7u, 0x84u}, - {0xA9u, 0x01u}, - {0xACu, 0x20u}, - {0xAFu, 0x40u}, - {0xE6u, 0x80u}, - {0xE8u, 0x40u}, - {0xEAu, 0x20u}, - {0xEEu, 0x40u}, - {0x01u, 0x40u}, - {0x04u, 0x10u}, - {0x08u, 0x20u}, - {0x0Cu, 0x80u}, - {0x10u, 0x10u}, - {0x14u, 0x40u}, - {0x62u, 0x04u}, - {0x67u, 0x80u}, - {0x8Cu, 0x20u}, - {0x8Fu, 0x08u}, + {0xE6u, 0x40u}, + {0xEEu, 0x80u}, + {0x81u, 0x40u}, + {0x88u, 0x04u}, + {0x95u, 0x80u}, + {0x9Fu, 0x01u}, + {0xA4u, 0x04u}, + {0xA7u, 0x80u}, + {0xE2u, 0x80u}, + {0x00u, 0x10u}, + {0x04u, 0x40u}, + {0x09u, 0x20u}, + {0x0Eu, 0x02u}, + {0x12u, 0x80u}, + {0x14u, 0x20u}, + {0x62u, 0x08u}, + {0x65u, 0x01u}, + {0x88u, 0x20u}, {0xC0u, 0x03u}, {0xC2u, 0x03u}, {0xC4u, 0x0Cu}, {0xD8u, 0x03u}, - {0xE2u, 0x02u}, - {0xE4u, 0x02u}, - {0x01u, 0x04u}, - {0x04u, 0x08u}, - {0x09u, 0x02u}, - {0x0Fu, 0x40u}, - {0x55u, 0x40u}, - {0x58u, 0x40u}, - {0x5Bu, 0x08u}, - {0x5Cu, 0x01u}, - {0x8Eu, 0x08u}, - {0x91u, 0x40u}, - {0x9Bu, 0x08u}, - {0x9Eu, 0x04u}, - {0xAFu, 0x40u}, - {0xB0u, 0xD0u}, - {0xB4u, 0x10u}, + {0xE2u, 0x01u}, + {0x00u, 0x08u}, + {0x07u, 0x40u}, + {0x08u, 0x02u}, + {0x0Du, 0x01u}, + {0x56u, 0x20u}, + {0x5Au, 0x08u}, + {0x5Fu, 0x80u}, + {0x62u, 0x10u}, + {0x84u, 0x08u}, + {0x88u, 0x02u}, + {0x8Bu, 0x80u}, + {0x8Eu, 0x80u}, + {0x9Du, 0x01u}, + {0xA2u, 0x81u}, + {0xB2u, 0x08u}, + {0xB4u, 0x50u}, + {0xB5u, 0x20u}, {0xC0u, 0x0Cu}, {0xC2u, 0x0Cu}, - {0xD4u, 0x03u}, - {0xD6u, 0x03u}, - {0xE6u, 0x02u}, - {0xEAu, 0x0Du}, - {0xEEu, 0x01u}, - {0x56u, 0x80u}, - {0x8Bu, 0x40u}, - {0x8Du, 0x40u}, - {0x8Eu, 0x80u}, - {0x90u, 0x08u}, - {0x91u, 0x44u}, - {0x94u, 0x20u}, - {0x9Eu, 0x04u}, - {0xA5u, 0x40u}, - {0xA6u, 0x08u}, - {0xA8u, 0x01u}, - {0xACu, 0x40u}, - {0xAFu, 0x40u}, - {0xB1u, 0x02u}, - {0xB4u, 0x10u}, {0xD4u, 0x02u}, - {0xE2u, 0x02u}, - {0xE4u, 0x08u}, - {0xE6u, 0x01u}, - {0xEEu, 0x06u}, - {0x08u, 0x80u}, - {0x0Bu, 0x80u}, - {0x0Fu, 0x82u}, - {0x82u, 0x04u}, - {0x85u, 0x20u}, - {0x89u, 0x04u}, - {0x90u, 0x08u}, - {0x91u, 0x04u}, - {0x94u, 0x20u}, - {0x97u, 0x80u}, - {0x9Cu, 0x80u}, - {0x9Eu, 0x04u}, - {0xA5u, 0x40u}, - {0xA6u, 0x08u}, - {0xA7u, 0x40u}, - {0xABu, 0x40u}, - {0xACu, 0x80u}, - {0xC2u, 0x0Fu}, + {0xD6u, 0x06u}, + {0xD8u, 0x02u}, + {0xE2u, 0x06u}, + {0xE4u, 0x04u}, + {0xEAu, 0x0Au}, + {0xECu, 0x01u}, + {0xEEu, 0x02u}, + {0x53u, 0x40u}, + {0x81u, 0x01u}, + {0x83u, 0x40u}, + {0x86u, 0x10u}, + {0x88u, 0x04u}, + {0x8Eu, 0x20u}, + {0x96u, 0x08u}, + {0x9Bu, 0x40u}, + {0x9Du, 0x01u}, + {0x9Eu, 0x30u}, + {0xA0u, 0x04u}, + {0xA2u, 0x01u}, + {0xA4u, 0x08u}, + {0xB1u, 0x01u}, + {0xD4u, 0x04u}, {0xE2u, 0x04u}, - {0x86u, 0x01u}, - {0x93u, 0x02u}, - {0x96u, 0x01u}, - {0xA3u, 0x20u}, - {0xA7u, 0x04u}, - {0xAFu, 0x80u}, + {0xE4u, 0x02u}, + {0xEAu, 0x04u}, + {0x09u, 0x08u}, + {0x0Bu, 0x01u}, + {0x0Cu, 0x08u}, + {0x0Fu, 0x02u}, + {0x81u, 0x20u}, + {0x83u, 0x01u}, + {0x8Bu, 0x80u}, + {0x96u, 0x08u}, + {0xA4u, 0x08u}, + {0xAFu, 0x40u}, + {0xB6u, 0x01u}, + {0xC2u, 0x0Fu}, + {0xE4u, 0x04u}, + {0xEAu, 0x08u}, + {0x67u, 0x80u}, + {0x87u, 0x40u}, + {0xAFu, 0x81u}, + {0xD8u, 0x80u}, {0xE2u, 0x10u}, + {0xEAu, 0x40u}, {0xEEu, 0x10u}, - {0x05u, 0x04u}, - {0x53u, 0x01u}, - {0x57u, 0x20u}, - {0x81u, 0x04u}, - {0x93u, 0x02u}, - {0xA3u, 0x20u}, - {0xB7u, 0x04u}, + {0x04u, 0x02u}, + {0x52u, 0x02u}, + {0x53u, 0x04u}, + {0x82u, 0x02u}, + {0x8Bu, 0x04u}, + {0x8Cu, 0x01u}, {0xC0u, 0x20u}, - {0xD4u, 0xC0u}, - {0xE4u, 0x80u}, - {0x85u, 0x40u}, - {0x8Cu, 0x04u}, - {0x90u, 0x08u}, - {0x94u, 0x20u}, - {0x99u, 0x20u}, - {0xA5u, 0x40u}, - {0xA6u, 0x08u}, + {0xD4u, 0xA0u}, + {0xE2u, 0x80u}, + {0x96u, 0x08u}, + {0x9Bu, 0x80u}, + {0x9Du, 0x20u}, + {0xADu, 0x08u}, {0xAFu, 0x01u}, - {0xE2u, 0x08u}, - {0x02u, 0x08u}, - {0x04u, 0x20u}, - {0x57u, 0x08u}, - {0x59u, 0x20u}, - {0x94u, 0x20u}, - {0x99u, 0x20u}, - {0xA3u, 0x08u}, - {0xA6u, 0x08u}, - {0xB3u, 0x08u}, + {0x01u, 0x20u}, + {0x04u, 0x40u}, + {0x5Bu, 0x80u}, + {0x5Fu, 0x20u}, + {0x87u, 0x20u}, + {0x8Cu, 0x40u}, + {0x9Bu, 0x80u}, + {0x9Du, 0x20u}, + {0xB2u, 0x04u}, {0xC0u, 0x03u}, - {0xD4u, 0x03u}, - {0xE8u, 0x04u}, - {0x10u, 0x03u}, - {0x11u, 0x01u}, - {0x1Au, 0x03u}, - {0x1Bu, 0x01u}, - {0x1Cu, 0x01u}, + {0xD4u, 0x01u}, + {0xD6u, 0x04u}, + {0xE2u, 0x02u}, + {0xE8u, 0x01u}, + {0x10u, 0x01u}, + {0x1Au, 0x01u}, {0x00u, 0xFDu}, {0x01u, 0xBFu}, {0x02u, 0x2Au}, @@ -2102,18 +1997,18 @@ void cyfitter_cfg(void) /* UDB_1_0_0_CONFIG Address: CYDEV_UCFG_B1_P2_U0_BASE Size (bytes): 128 */ static const uint8 CYCODE BS_UDB_1_0_0_CONFIG_VAL[] = { - 0x00u, 0x08u, 0x02u, 0x10u, 0x00u, 0x6Cu, 0x05u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x91u, 0x00u, 0x4Eu, - 0x00u, 0x71u, 0x18u, 0x82u, 0x10u, 0xC0u, 0x06u, 0x2Fu, 0x00u, 0x00u, 0x00u, 0x00u, 0x02u, 0xA4u, 0x04u, 0x40u, - 0x00u, 0x2Cu, 0x00u, 0x40u, 0x00u, 0x40u, 0x00u, 0x2Cu, 0x08u, 0x6Cu, 0x06u, 0x00u, 0x00u, 0x64u, 0x00u, 0x08u, - 0x1Eu, 0x0Fu, 0x00u, 0x31u, 0x00u, 0x00u, 0x01u, 0xC0u, 0x00u, 0x00u, 0x00u, 0x8Cu, 0x00u, 0x00u, 0x00u, 0x00u, - 0x43u, 0x05u, 0x20u, 0x00u, 0x06u, 0xCBu, 0xFDu, 0xE0u, 0x2Fu, 0xFFu, 0xFFu, 0xFFu, 0x22u, 0x00u, 0xF0u, 0x08u, - 0x04u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x04u, 0x04u, 0x04u, 0x04u, 0x00u, 0x00u, 0x00u, 0x01u, + 0x02u, 0x1Fu, 0x01u, 0x20u, 0x00u, 0xC0u, 0x00u, 0x08u, 0x00u, 0xC0u, 0x10u, 0x04u, 0x04u, 0x80u, 0x88u, 0x00u, + 0x08u, 0x90u, 0x04u, 0x40u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u, 0x7Fu, 0x00u, 0x80u, 0x01u, 0x00u, 0x42u, 0x60u, + 0x00u, 0xC0u, 0x00u, 0x02u, 0x00u, 0x00u, 0x20u, 0x00u, 0x00u, 0x00u, 0x00u, 0x9Fu, 0x53u, 0xC0u, 0xACu, 0x01u, + 0xC0u, 0xFFu, 0x0Fu, 0x00u, 0x30u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x15u, 0x01u, + 0x32u, 0x01u, 0x40u, 0x00u, 0x06u, 0xBEu, 0xFBu, 0xDCu, 0x3Fu, 0xFFu, 0xFFu, 0xFFu, 0x22u, 0x00u, 0xF0u, 0x08u, + 0x04u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x04u, 0x04u, 0x04u, 0x00u, 0x00u, 0x00u, 0x00u, 0x01u, 0x00u, 0x00u, 0xC0u, 0x00u, 0x40u, 0x01u, 0x10u, 0x11u, 0xC0u, 0x01u, 0x00u, 0x11u, 0x40u, 0x01u, 0x40u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}; /* UCFG_BCTL0 Address: CYREG_BCTL0_MDCLK_EN Size (bytes): 16 */ static const uint8 CYCODE BS_UCFG_BCTL0_VAL[] = { - 0x03u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x03u, 0x01u, 0x02u, 0x01u, 0x02u, 0x01u, 0x03u, 0x01u}; + 0x03u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x02u, 0x01u, 0x03u, 0x01u, 0x02u, 0x01u, 0x02u, 0x01u}; static const cfg_memcpy_t CYCODE cfg_memcpy_list [] = { /* dest, src, size */ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h index cc5db3c7..03118c3d 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cyfitter_cfg.h +* File Name: cyfitter_cfg.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file provides basic startup and mux configration settings * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc index 1de9d336..0b9318f3 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc @@ -4,6 +4,7 @@ .include "cydevicegnu_trm.inc" /* LED1 */ +.set LED1__0__INTTYPE, CYREG_PICU0_INTTYPE1 .set LED1__0__MASK, 0x02 .set LED1__0__PC, CYREG_PRT0_PC1 .set LED1__0__PORT, 0 @@ -19,6 +20,7 @@ .set LED1__DM2, CYREG_PRT0_DM2 .set LED1__DR, CYREG_PRT0_DR .set LED1__INP_DIS, CYREG_PRT0_INP_DIS +.set LED1__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU0_BASE .set LED1__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set LED1__LCD_EN, CYREG_PRT0_LCD_EN .set LED1__MASK, 0x02 @@ -36,6 +38,7 @@ .set LED1__SLW, CYREG_PRT0_SLW /* SD_CD */ +.set SD_CD__0__INTTYPE, CYREG_PICU3_INTTYPE5 .set SD_CD__0__MASK, 0x20 .set SD_CD__0__PC, CYREG_PRT3_PC5 .set SD_CD__0__PORT, 3 @@ -51,6 +54,7 @@ .set SD_CD__DM2, CYREG_PRT3_DM2 .set SD_CD__DR, CYREG_PRT3_DR .set SD_CD__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_CD__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_CD__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_CD__LCD_EN, CYREG_PRT3_LCD_EN .set SD_CD__MASK, 0x20 @@ -68,6 +72,7 @@ .set SD_CD__SLW, CYREG_PRT3_SLW /* SD_CS */ +.set SD_CS__0__INTTYPE, CYREG_PICU3_INTTYPE4 .set SD_CS__0__MASK, 0x10 .set SD_CS__0__PC, CYREG_PRT3_PC4 .set SD_CS__0__PORT, 3 @@ -83,6 +88,7 @@ .set SD_CS__DM2, CYREG_PRT3_DM2 .set SD_CS__DR, CYREG_PRT3_DR .set SD_CS__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_CS__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_CS__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_CS__LCD_EN, CYREG_PRT3_LCD_EN .set SD_CS__MASK, 0x10 @@ -120,6 +126,7 @@ .set USBFS_bus_reset__INTC_SET_PD_REG, CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +.set USBFS_Dm__0__INTTYPE, CYREG_PICU15_INTTYPE7 .set USBFS_Dm__0__MASK, 0x80 .set USBFS_Dm__0__PC, CYREG_IO_PC_PRT15_7_6_PC1 .set USBFS_Dm__0__PORT, 15 @@ -135,6 +142,7 @@ .set USBFS_Dm__DM2, CYREG_PRT15_DM2 .set USBFS_Dm__DR, CYREG_PRT15_DR .set USBFS_Dm__INP_DIS, CYREG_PRT15_INP_DIS +.set USBFS_Dm__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU15_BASE .set USBFS_Dm__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set USBFS_Dm__LCD_EN, CYREG_PRT15_LCD_EN .set USBFS_Dm__MASK, 0x80 @@ -152,6 +160,7 @@ .set USBFS_Dm__SLW, CYREG_PRT15_SLW /* USBFS_Dp */ +.set USBFS_Dp__0__INTTYPE, CYREG_PICU15_INTTYPE6 .set USBFS_Dp__0__MASK, 0x40 .set USBFS_Dp__0__PC, CYREG_IO_PC_PRT15_7_6_PC0 .set USBFS_Dp__0__PORT, 15 @@ -168,6 +177,7 @@ .set USBFS_Dp__DR, CYREG_PRT15_DR .set USBFS_Dp__INP_DIS, CYREG_PRT15_INP_DIS .set USBFS_Dp__INTSTAT, CYREG_PICU15_INTSTAT +.set USBFS_Dp__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU15_BASE .set USBFS_Dp__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set USBFS_Dp__LCD_EN, CYREG_PRT15_LCD_EN .set USBFS_Dp__MASK, 0x40 @@ -382,6 +392,7 @@ .set USBFS_USB__USBIO_CR1, CYREG_USB_USBIO_CR1 /* EXTLED */ +.set EXTLED__0__INTTYPE, CYREG_PICU0_INTTYPE0 .set EXTLED__0__MASK, 0x01 .set EXTLED__0__PC, CYREG_PRT0_PC0 .set EXTLED__0__PORT, 0 @@ -397,6 +408,7 @@ .set EXTLED__DM2, CYREG_PRT0_DM2 .set EXTLED__DR, CYREG_PRT0_DR .set EXTLED__INP_DIS, CYREG_PRT0_INP_DIS +.set EXTLED__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU0_BASE .set EXTLED__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set EXTLED__LCD_EN, CYREG_PRT0_LCD_EN .set EXTLED__MASK, 0x01 @@ -414,34 +426,34 @@ .set EXTLED__SLW, CYREG_PRT0_SLW /* SDCard_BSPIM */ -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB12_13_ACTL -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB12_13_CTL -.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB12_13_CTL -.set SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB12_13_CTL -.set SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB12_13_CTL -.set SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG, CYREG_B0_UDB12_13_MSK -.set SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB12_13_MSK -.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB12_13_MSK -.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB12_13_MSK -.set SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG, CYREG_B0_UDB12_ACTL -.set SDCard_BSPIM_BitCounter__CONTROL_REG, CYREG_B0_UDB12_CTL -.set SDCard_BSPIM_BitCounter__CONTROL_ST_REG, CYREG_B0_UDB12_ST_CTL -.set SDCard_BSPIM_BitCounter__COUNT_REG, CYREG_B0_UDB12_CTL -.set SDCard_BSPIM_BitCounter__COUNT_ST_REG, CYREG_B0_UDB12_ST_CTL -.set SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL -.set SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL -.set SDCard_BSPIM_BitCounter__PERIOD_REG, CYREG_B0_UDB12_MSK -.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB12_13_ACTL -.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG, CYREG_B0_UDB12_13_ST -.set SDCard_BSPIM_BitCounter_ST__MASK_REG, CYREG_B0_UDB12_MSK -.set SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL -.set SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG, CYREG_B0_UDB12_ACTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG, CYREG_B0_UDB12_ST_CTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG, CYREG_B0_UDB12_ST_CTL -.set SDCard_BSPIM_BitCounter_ST__STATUS_REG, CYREG_B0_UDB12_ST -.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B1_UDB07_08_ACTL -.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG, CYREG_B1_UDB07_08_ST +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG, CYREG_B1_UDB06_07_ACTL +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG, CYREG_B1_UDB06_07_CTL +.set SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG, CYREG_B1_UDB06_07_CTL +.set SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG, CYREG_B1_UDB06_07_CTL +.set SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG, CYREG_B1_UDB06_07_CTL +.set SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG, CYREG_B1_UDB06_07_MSK +.set SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG, CYREG_B1_UDB06_07_MSK +.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG, CYREG_B1_UDB06_07_MSK +.set SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG, CYREG_B1_UDB06_07_MSK +.set SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG, CYREG_B1_UDB06_ACTL +.set SDCard_BSPIM_BitCounter__CONTROL_REG, CYREG_B1_UDB06_CTL +.set SDCard_BSPIM_BitCounter__CONTROL_ST_REG, CYREG_B1_UDB06_ST_CTL +.set SDCard_BSPIM_BitCounter__COUNT_REG, CYREG_B1_UDB06_CTL +.set SDCard_BSPIM_BitCounter__COUNT_ST_REG, CYREG_B1_UDB06_ST_CTL +.set SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG, CYREG_B1_UDB06_MSK_ACTL +.set SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG, CYREG_B1_UDB06_MSK_ACTL +.set SDCard_BSPIM_BitCounter__PERIOD_REG, CYREG_B1_UDB06_MSK +.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG, CYREG_B1_UDB06_07_ACTL +.set SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG, CYREG_B1_UDB06_07_ST +.set SDCard_BSPIM_BitCounter_ST__MASK_REG, CYREG_B1_UDB06_MSK +.set SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG, CYREG_B1_UDB06_MSK_ACTL +.set SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG, CYREG_B1_UDB06_MSK_ACTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG, CYREG_B1_UDB06_ACTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG, CYREG_B1_UDB06_ST_CTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG, CYREG_B1_UDB06_ST_CTL +.set SDCard_BSPIM_BitCounter_ST__STATUS_REG, CYREG_B1_UDB06_ST +.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB07_08_ACTL +.set SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG, CYREG_B0_UDB07_08_ST .set SDCard_BSPIM_RxStsReg__4__MASK, 0x10 .set SDCard_BSPIM_RxStsReg__4__POS, 4 .set SDCard_BSPIM_RxStsReg__5__MASK, 0x20 @@ -449,13 +461,9 @@ .set SDCard_BSPIM_RxStsReg__6__MASK, 0x40 .set SDCard_BSPIM_RxStsReg__6__POS, 6 .set SDCard_BSPIM_RxStsReg__MASK, 0x70 -.set SDCard_BSPIM_RxStsReg__MASK_REG, CYREG_B1_UDB07_MSK -.set SDCard_BSPIM_RxStsReg__MASK_ST_AUX_CTL_REG, CYREG_B1_UDB07_MSK_ACTL -.set SDCard_BSPIM_RxStsReg__PER_ST_AUX_CTL_REG, CYREG_B1_UDB07_MSK_ACTL -.set SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG, CYREG_B1_UDB07_ACTL -.set SDCard_BSPIM_RxStsReg__STATUS_CNT_REG, CYREG_B1_UDB07_ST_CTL -.set SDCard_BSPIM_RxStsReg__STATUS_CONTROL_REG, CYREG_B1_UDB07_ST_CTL -.set SDCard_BSPIM_RxStsReg__STATUS_REG, CYREG_B1_UDB07_ST +.set SDCard_BSPIM_RxStsReg__MASK_REG, CYREG_B0_UDB07_MSK +.set SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG, CYREG_B0_UDB07_ACTL +.set SDCard_BSPIM_RxStsReg__STATUS_REG, CYREG_B0_UDB07_ST .set SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG, CYREG_B1_UDB04_05_A0 .set SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG, CYREG_B1_UDB04_05_A1 .set SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG, CYREG_B1_UDB04_05_D0 @@ -473,12 +481,12 @@ .set SDCard_BSPIM_sR8_Dp_u0__F0_F1_REG, CYREG_B1_UDB04_F0_F1 .set SDCard_BSPIM_sR8_Dp_u0__F0_REG, CYREG_B1_UDB04_F0 .set SDCard_BSPIM_sR8_Dp_u0__F1_REG, CYREG_B1_UDB04_F1 -.set SDCard_BSPIM_sR8_Dp_u0__MSK_DP_AUX_CTL_REG, CYREG_B1_UDB04_MSK_ACTL -.set SDCard_BSPIM_sR8_Dp_u0__PER_DP_AUX_CTL_REG, CYREG_B1_UDB04_MSK_ACTL .set SDCard_BSPIM_TxStsReg__0__MASK, 0x01 .set SDCard_BSPIM_TxStsReg__0__POS, 0 .set SDCard_BSPIM_TxStsReg__1__MASK, 0x02 .set SDCard_BSPIM_TxStsReg__1__POS, 1 +.set SDCard_BSPIM_TxStsReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB04_05_ACTL +.set SDCard_BSPIM_TxStsReg__16BIT_STATUS_REG, CYREG_B0_UDB04_05_ST .set SDCard_BSPIM_TxStsReg__2__MASK, 0x04 .set SDCard_BSPIM_TxStsReg__2__POS, 2 .set SDCard_BSPIM_TxStsReg__3__MASK, 0x08 @@ -486,11 +494,12 @@ .set SDCard_BSPIM_TxStsReg__4__MASK, 0x10 .set SDCard_BSPIM_TxStsReg__4__POS, 4 .set SDCard_BSPIM_TxStsReg__MASK, 0x1F -.set SDCard_BSPIM_TxStsReg__MASK_REG, CYREG_B1_UDB11_MSK -.set SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG, CYREG_B1_UDB11_ACTL -.set SDCard_BSPIM_TxStsReg__STATUS_REG, CYREG_B1_UDB11_ST +.set SDCard_BSPIM_TxStsReg__MASK_REG, CYREG_B0_UDB04_MSK +.set SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG, CYREG_B0_UDB04_ACTL +.set SDCard_BSPIM_TxStsReg__STATUS_REG, CYREG_B0_UDB04_ST /* SD_SCK */ +.set SD_SCK__0__INTTYPE, CYREG_PICU3_INTTYPE2 .set SD_SCK__0__MASK, 0x04 .set SD_SCK__0__PC, CYREG_PRT3_PC2 .set SD_SCK__0__PORT, 3 @@ -506,6 +515,7 @@ .set SD_SCK__DM2, CYREG_PRT3_DM2 .set SD_SCK__DR, CYREG_PRT3_DR .set SD_SCK__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_SCK__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_SCK__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_SCK__LCD_EN, CYREG_PRT3_LCD_EN .set SD_SCK__MASK, 0x04 @@ -534,6 +544,7 @@ .set SCSI_In__0__DM2, CYREG_PRT2_DM2 .set SCSI_In__0__DR, CYREG_PRT2_DR .set SCSI_In__0__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In__0__INTTYPE, CYREG_PICU2_INTTYPE1 .set SCSI_In__0__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In__0__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In__0__MASK, 0x02 @@ -561,6 +572,7 @@ .set SCSI_In__1__DM2, CYREG_PRT4_DM2 .set SCSI_In__1__DR, CYREG_PRT4_DR .set SCSI_In__1__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_In__1__INTTYPE, CYREG_PICU4_INTTYPE6 .set SCSI_In__1__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_In__1__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_In__1__MASK, 0x40 @@ -588,6 +600,7 @@ .set SCSI_In__2__DM2, CYREG_PRT4_DM2 .set SCSI_In__2__DR, CYREG_PRT4_DR .set SCSI_In__2__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_In__2__INTTYPE, CYREG_PICU4_INTTYPE2 .set SCSI_In__2__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_In__2__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_In__2__MASK, 0x04 @@ -615,6 +628,7 @@ .set SCSI_In__3__DM2, CYREG_PRT0_DM2 .set SCSI_In__3__DR, CYREG_PRT0_DR .set SCSI_In__3__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_In__3__INTTYPE, CYREG_PICU0_INTTYPE5 .set SCSI_In__3__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_In__3__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_In__3__MASK, 0x20 @@ -642,6 +656,7 @@ .set SCSI_In__4__DM2, CYREG_PRT0_DM2 .set SCSI_In__4__DR, CYREG_PRT0_DR .set SCSI_In__4__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_In__4__INTTYPE, CYREG_PICU0_INTTYPE4 .set SCSI_In__4__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_In__4__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_In__4__MASK, 0x10 @@ -669,6 +684,7 @@ .set SCSI_In__CD__DM2, CYREG_PRT4_DM2 .set SCSI_In__CD__DR, CYREG_PRT4_DR .set SCSI_In__CD__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_In__CD__INTTYPE, CYREG_PICU4_INTTYPE2 .set SCSI_In__CD__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_In__CD__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_In__CD__MASK, 0x04 @@ -696,6 +712,7 @@ .set SCSI_In__DBP__DM2, CYREG_PRT2_DM2 .set SCSI_In__DBP__DR, CYREG_PRT2_DR .set SCSI_In__DBP__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In__DBP__INTTYPE, CYREG_PICU2_INTTYPE1 .set SCSI_In__DBP__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In__DBP__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In__DBP__MASK, 0x02 @@ -723,6 +740,7 @@ .set SCSI_In__IO__DM2, CYREG_PRT0_DM2 .set SCSI_In__IO__DR, CYREG_PRT0_DR .set SCSI_In__IO__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_In__IO__INTTYPE, CYREG_PICU0_INTTYPE4 .set SCSI_In__IO__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_In__IO__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_In__IO__MASK, 0x10 @@ -750,6 +768,7 @@ .set SCSI_In__MSG__DM2, CYREG_PRT4_DM2 .set SCSI_In__MSG__DR, CYREG_PRT4_DR .set SCSI_In__MSG__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_In__MSG__INTTYPE, CYREG_PICU4_INTTYPE6 .set SCSI_In__MSG__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_In__MSG__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_In__MSG__MASK, 0x40 @@ -777,6 +796,7 @@ .set SCSI_In__REQ__DM2, CYREG_PRT0_DM2 .set SCSI_In__REQ__DR, CYREG_PRT0_DR .set SCSI_In__REQ__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_In__REQ__INTTYPE, CYREG_PICU0_INTTYPE5 .set SCSI_In__REQ__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_In__REQ__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_In__REQ__MASK, 0x20 @@ -806,6 +826,7 @@ .set SCSI_In_DBx__0__DM2, CYREG_PRT5_DM2 .set SCSI_In_DBx__0__DR, CYREG_PRT5_DR .set SCSI_In_DBx__0__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In_DBx__0__INTTYPE, CYREG_PICU5_INTTYPE3 .set SCSI_In_DBx__0__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In_DBx__0__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In_DBx__0__MASK, 0x08 @@ -833,6 +854,7 @@ .set SCSI_In_DBx__1__DM2, CYREG_PRT5_DM2 .set SCSI_In_DBx__1__DR, CYREG_PRT5_DR .set SCSI_In_DBx__1__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In_DBx__1__INTTYPE, CYREG_PICU5_INTTYPE2 .set SCSI_In_DBx__1__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In_DBx__1__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In_DBx__1__MASK, 0x04 @@ -860,6 +882,7 @@ .set SCSI_In_DBx__2__DM2, CYREG_PRT6_DM2 .set SCSI_In_DBx__2__DR, CYREG_PRT6_DR .set SCSI_In_DBx__2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In_DBx__2__INTTYPE, CYREG_PICU6_INTTYPE7 .set SCSI_In_DBx__2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In_DBx__2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In_DBx__2__MASK, 0x80 @@ -887,6 +910,7 @@ .set SCSI_In_DBx__3__DM2, CYREG_PRT6_DM2 .set SCSI_In_DBx__3__DR, CYREG_PRT6_DR .set SCSI_In_DBx__3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In_DBx__3__INTTYPE, CYREG_PICU6_INTTYPE6 .set SCSI_In_DBx__3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In_DBx__3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In_DBx__3__MASK, 0x40 @@ -912,6 +936,7 @@ .set SCSI_In_DBx__4__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__4__DR, CYREG_PRT12_DR .set SCSI_In_DBx__4__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__4__INTTYPE, CYREG_PICU12_INTTYPE5 .set SCSI_In_DBx__4__MASK, 0x20 .set SCSI_In_DBx__4__PC, CYREG_PRT12_PC5 .set SCSI_In_DBx__4__PORT, 12 @@ -938,6 +963,7 @@ .set SCSI_In_DBx__5__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__5__DR, CYREG_PRT12_DR .set SCSI_In_DBx__5__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__5__INTTYPE, CYREG_PICU12_INTTYPE4 .set SCSI_In_DBx__5__MASK, 0x10 .set SCSI_In_DBx__5__PC, CYREG_PRT12_PC4 .set SCSI_In_DBx__5__PORT, 12 @@ -966,6 +992,7 @@ .set SCSI_In_DBx__6__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__6__DR, CYREG_PRT2_DR .set SCSI_In_DBx__6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__6__INTTYPE, CYREG_PICU2_INTTYPE5 .set SCSI_In_DBx__6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__6__MASK, 0x20 @@ -993,6 +1020,7 @@ .set SCSI_In_DBx__7__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__7__DR, CYREG_PRT2_DR .set SCSI_In_DBx__7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__7__INTTYPE, CYREG_PICU2_INTTYPE4 .set SCSI_In_DBx__7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__7__MASK, 0x10 @@ -1020,6 +1048,7 @@ .set SCSI_In_DBx__DB0__DM2, CYREG_PRT5_DM2 .set SCSI_In_DBx__DB0__DR, CYREG_PRT5_DR .set SCSI_In_DBx__DB0__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In_DBx__DB0__INTTYPE, CYREG_PICU5_INTTYPE3 .set SCSI_In_DBx__DB0__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In_DBx__DB0__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In_DBx__DB0__MASK, 0x08 @@ -1047,6 +1076,7 @@ .set SCSI_In_DBx__DB1__DM2, CYREG_PRT5_DM2 .set SCSI_In_DBx__DB1__DR, CYREG_PRT5_DR .set SCSI_In_DBx__DB1__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_In_DBx__DB1__INTTYPE, CYREG_PICU5_INTTYPE2 .set SCSI_In_DBx__DB1__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_In_DBx__DB1__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_In_DBx__DB1__MASK, 0x04 @@ -1074,6 +1104,7 @@ .set SCSI_In_DBx__DB2__DM2, CYREG_PRT6_DM2 .set SCSI_In_DBx__DB2__DR, CYREG_PRT6_DR .set SCSI_In_DBx__DB2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In_DBx__DB2__INTTYPE, CYREG_PICU6_INTTYPE7 .set SCSI_In_DBx__DB2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In_DBx__DB2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In_DBx__DB2__MASK, 0x80 @@ -1101,6 +1132,7 @@ .set SCSI_In_DBx__DB3__DM2, CYREG_PRT6_DM2 .set SCSI_In_DBx__DB3__DR, CYREG_PRT6_DR .set SCSI_In_DBx__DB3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_In_DBx__DB3__INTTYPE, CYREG_PICU6_INTTYPE6 .set SCSI_In_DBx__DB3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_In_DBx__DB3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_In_DBx__DB3__MASK, 0x40 @@ -1126,6 +1158,7 @@ .set SCSI_In_DBx__DB4__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__DB4__DR, CYREG_PRT12_DR .set SCSI_In_DBx__DB4__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__DB4__INTTYPE, CYREG_PICU12_INTTYPE5 .set SCSI_In_DBx__DB4__MASK, 0x20 .set SCSI_In_DBx__DB4__PC, CYREG_PRT12_PC5 .set SCSI_In_DBx__DB4__PORT, 12 @@ -1152,6 +1185,7 @@ .set SCSI_In_DBx__DB5__DM2, CYREG_PRT12_DM2 .set SCSI_In_DBx__DB5__DR, CYREG_PRT12_DR .set SCSI_In_DBx__DB5__INP_DIS, CYREG_PRT12_INP_DIS +.set SCSI_In_DBx__DB5__INTTYPE, CYREG_PICU12_INTTYPE4 .set SCSI_In_DBx__DB5__MASK, 0x10 .set SCSI_In_DBx__DB5__PC, CYREG_PRT12_PC4 .set SCSI_In_DBx__DB5__PORT, 12 @@ -1180,6 +1214,7 @@ .set SCSI_In_DBx__DB6__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB6__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB6__INTTYPE, CYREG_PICU2_INTTYPE5 .set SCSI_In_DBx__DB6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB6__MASK, 0x20 @@ -1207,6 +1242,7 @@ .set SCSI_In_DBx__DB7__DM2, CYREG_PRT2_DM2 .set SCSI_In_DBx__DB7__DR, CYREG_PRT2_DR .set SCSI_In_DBx__DB7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_In_DBx__DB7__INTTYPE, CYREG_PICU2_INTTYPE4 .set SCSI_In_DBx__DB7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_In_DBx__DB7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_In_DBx__DB7__MASK, 0x10 @@ -1225,6 +1261,7 @@ .set SCSI_In_DBx__DB7__SLW, CYREG_PRT2_SLW /* SD_MISO */ +.set SD_MISO__0__INTTYPE, CYREG_PICU3_INTTYPE1 .set SD_MISO__0__MASK, 0x02 .set SD_MISO__0__PC, CYREG_PRT3_PC1 .set SD_MISO__0__PORT, 3 @@ -1240,6 +1277,7 @@ .set SD_MISO__DM2, CYREG_PRT3_DM2 .set SD_MISO__DR, CYREG_PRT3_DR .set SD_MISO__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_MISO__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_MISO__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_MISO__LCD_EN, CYREG_PRT3_LCD_EN .set SD_MISO__MASK, 0x02 @@ -1257,6 +1295,7 @@ .set SD_MISO__SLW, CYREG_PRT3_SLW /* SD_MOSI */ +.set SD_MOSI__0__INTTYPE, CYREG_PICU3_INTTYPE3 .set SD_MOSI__0__MASK, 0x08 .set SD_MOSI__0__PC, CYREG_PRT3_PC3 .set SD_MOSI__0__PORT, 3 @@ -1272,6 +1311,7 @@ .set SD_MOSI__DM2, CYREG_PRT3_DM2 .set SD_MOSI__DR, CYREG_PRT3_DR .set SD_MOSI__INP_DIS, CYREG_PRT3_INP_DIS +.set SD_MOSI__INTTYPE_BASE, CYDEV_PICU_INTTYPE_PICU3_BASE .set SD_MOSI__LCD_COM_SEG, CYREG_PRT3_LCD_COM_SEG .set SD_MOSI__LCD_EN, CYREG_PRT3_LCD_EN .set SD_MOSI__MASK, 0x08 @@ -1311,6 +1351,7 @@ .set SCSI_Out__0__DM2, CYREG_PRT15_DM2 .set SCSI_Out__0__DR, CYREG_PRT15_DR .set SCSI_Out__0__INP_DIS, CYREG_PRT15_INP_DIS +.set SCSI_Out__0__INTTYPE, CYREG_PICU15_INTTYPE5 .set SCSI_Out__0__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set SCSI_Out__0__LCD_EN, CYREG_PRT15_LCD_EN .set SCSI_Out__0__MASK, 0x20 @@ -1338,6 +1379,7 @@ .set SCSI_Out__1__DM2, CYREG_PRT15_DM2 .set SCSI_Out__1__DR, CYREG_PRT15_DR .set SCSI_Out__1__INP_DIS, CYREG_PRT15_INP_DIS +.set SCSI_Out__1__INTTYPE, CYREG_PICU15_INTTYPE4 .set SCSI_Out__1__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set SCSI_Out__1__LCD_EN, CYREG_PRT15_LCD_EN .set SCSI_Out__1__MASK, 0x10 @@ -1365,6 +1407,7 @@ .set SCSI_Out__2__DM2, CYREG_PRT6_DM2 .set SCSI_Out__2__DR, CYREG_PRT6_DR .set SCSI_Out__2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out__2__INTTYPE, CYREG_PICU6_INTTYPE1 .set SCSI_Out__2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out__2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out__2__MASK, 0x02 @@ -1392,6 +1435,7 @@ .set SCSI_Out__3__DM2, CYREG_PRT6_DM2 .set SCSI_Out__3__DR, CYREG_PRT6_DR .set SCSI_Out__3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out__3__INTTYPE, CYREG_PICU6_INTTYPE0 .set SCSI_Out__3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out__3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out__3__MASK, 0x01 @@ -1419,6 +1463,7 @@ .set SCSI_Out__4__DM2, CYREG_PRT4_DM2 .set SCSI_Out__4__DR, CYREG_PRT4_DR .set SCSI_Out__4__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__4__INTTYPE, CYREG_PICU4_INTTYPE5 .set SCSI_Out__4__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__4__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__4__MASK, 0x20 @@ -1446,6 +1491,7 @@ .set SCSI_Out__5__DM2, CYREG_PRT4_DM2 .set SCSI_Out__5__DR, CYREG_PRT4_DR .set SCSI_Out__5__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__5__INTTYPE, CYREG_PICU4_INTTYPE4 .set SCSI_Out__5__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__5__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__5__MASK, 0x10 @@ -1473,6 +1519,7 @@ .set SCSI_Out__6__DM2, CYREG_PRT0_DM2 .set SCSI_Out__6__DR, CYREG_PRT0_DR .set SCSI_Out__6__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__6__INTTYPE, CYREG_PICU0_INTTYPE7 .set SCSI_Out__6__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__6__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__6__MASK, 0x80 @@ -1500,6 +1547,7 @@ .set SCSI_Out__7__DM2, CYREG_PRT0_DM2 .set SCSI_Out__7__DR, CYREG_PRT0_DR .set SCSI_Out__7__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__7__INTTYPE, CYREG_PICU0_INTTYPE6 .set SCSI_Out__7__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__7__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__7__MASK, 0x40 @@ -1527,6 +1575,7 @@ .set SCSI_Out__8__DM2, CYREG_PRT0_DM2 .set SCSI_Out__8__DR, CYREG_PRT0_DR .set SCSI_Out__8__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__8__INTTYPE, CYREG_PICU0_INTTYPE3 .set SCSI_Out__8__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__8__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__8__MASK, 0x08 @@ -1554,6 +1603,7 @@ .set SCSI_Out__9__DM2, CYREG_PRT0_DM2 .set SCSI_Out__9__DR, CYREG_PRT0_DR .set SCSI_Out__9__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__9__INTTYPE, CYREG_PICU0_INTTYPE2 .set SCSI_Out__9__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__9__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__9__MASK, 0x04 @@ -1581,6 +1631,7 @@ .set SCSI_Out__ACK__DM2, CYREG_PRT6_DM2 .set SCSI_Out__ACK__DR, CYREG_PRT6_DR .set SCSI_Out__ACK__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out__ACK__INTTYPE, CYREG_PICU6_INTTYPE0 .set SCSI_Out__ACK__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out__ACK__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out__ACK__MASK, 0x01 @@ -1608,6 +1659,7 @@ .set SCSI_Out__ATN__DM2, CYREG_PRT15_DM2 .set SCSI_Out__ATN__DR, CYREG_PRT15_DR .set SCSI_Out__ATN__INP_DIS, CYREG_PRT15_INP_DIS +.set SCSI_Out__ATN__INTTYPE, CYREG_PICU15_INTTYPE4 .set SCSI_Out__ATN__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set SCSI_Out__ATN__LCD_EN, CYREG_PRT15_LCD_EN .set SCSI_Out__ATN__MASK, 0x10 @@ -1635,6 +1687,7 @@ .set SCSI_Out__BSY__DM2, CYREG_PRT6_DM2 .set SCSI_Out__BSY__DR, CYREG_PRT6_DR .set SCSI_Out__BSY__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out__BSY__INTTYPE, CYREG_PICU6_INTTYPE1 .set SCSI_Out__BSY__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out__BSY__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out__BSY__MASK, 0x02 @@ -1662,6 +1715,7 @@ .set SCSI_Out__CD_raw__DM2, CYREG_PRT0_DM2 .set SCSI_Out__CD_raw__DR, CYREG_PRT0_DR .set SCSI_Out__CD_raw__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__CD_raw__INTTYPE, CYREG_PICU0_INTTYPE6 .set SCSI_Out__CD_raw__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__CD_raw__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__CD_raw__MASK, 0x40 @@ -1689,6 +1743,7 @@ .set SCSI_Out__DBP_raw__DM2, CYREG_PRT15_DM2 .set SCSI_Out__DBP_raw__DR, CYREG_PRT15_DR .set SCSI_Out__DBP_raw__INP_DIS, CYREG_PRT15_INP_DIS +.set SCSI_Out__DBP_raw__INTTYPE, CYREG_PICU15_INTTYPE5 .set SCSI_Out__DBP_raw__LCD_COM_SEG, CYREG_PRT15_LCD_COM_SEG .set SCSI_Out__DBP_raw__LCD_EN, CYREG_PRT15_LCD_EN .set SCSI_Out__DBP_raw__MASK, 0x20 @@ -1716,6 +1771,7 @@ .set SCSI_Out__IO_raw__DM2, CYREG_PRT0_DM2 .set SCSI_Out__IO_raw__DR, CYREG_PRT0_DR .set SCSI_Out__IO_raw__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__IO_raw__INTTYPE, CYREG_PICU0_INTTYPE2 .set SCSI_Out__IO_raw__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__IO_raw__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__IO_raw__MASK, 0x04 @@ -1743,6 +1799,7 @@ .set SCSI_Out__MSG_raw__DM2, CYREG_PRT4_DM2 .set SCSI_Out__MSG_raw__DR, CYREG_PRT4_DR .set SCSI_Out__MSG_raw__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__MSG_raw__INTTYPE, CYREG_PICU4_INTTYPE4 .set SCSI_Out__MSG_raw__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__MSG_raw__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__MSG_raw__MASK, 0x10 @@ -1770,6 +1827,7 @@ .set SCSI_Out__REQ__DM2, CYREG_PRT0_DM2 .set SCSI_Out__REQ__DR, CYREG_PRT0_DR .set SCSI_Out__REQ__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__REQ__INTTYPE, CYREG_PICU0_INTTYPE3 .set SCSI_Out__REQ__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__REQ__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__REQ__MASK, 0x08 @@ -1797,6 +1855,7 @@ .set SCSI_Out__RST__DM2, CYREG_PRT4_DM2 .set SCSI_Out__RST__DR, CYREG_PRT4_DR .set SCSI_Out__RST__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Out__RST__INTTYPE, CYREG_PICU4_INTTYPE5 .set SCSI_Out__RST__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Out__RST__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Out__RST__MASK, 0x20 @@ -1824,6 +1883,7 @@ .set SCSI_Out__SEL__DM2, CYREG_PRT0_DM2 .set SCSI_Out__SEL__DR, CYREG_PRT0_DR .set SCSI_Out__SEL__INP_DIS, CYREG_PRT0_INP_DIS +.set SCSI_Out__SEL__INTTYPE, CYREG_PICU0_INTTYPE7 .set SCSI_Out__SEL__LCD_COM_SEG, CYREG_PRT0_LCD_COM_SEG .set SCSI_Out__SEL__LCD_EN, CYREG_PRT0_LCD_EN .set SCSI_Out__SEL__MASK, 0x80 @@ -1846,15 +1906,15 @@ .set SCSI_Out_Bits_Sync_ctrl_reg__0__POS, 0 .set SCSI_Out_Bits_Sync_ctrl_reg__1__MASK, 0x02 .set SCSI_Out_Bits_Sync_ctrl_reg__1__POS, 1 -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B1_UDB07_08_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B1_UDB07_08_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B1_UDB07_08_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B1_UDB07_08_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B1_UDB07_08_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B1_UDB07_08_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B1_UDB07_08_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B1_UDB07_08_MSK -.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B1_UDB07_08_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB02_03_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB02_03_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB02_03_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB02_03_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB02_03_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB02_03_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB02_03_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB02_03_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB02_03_MSK .set SCSI_Out_Bits_Sync_ctrl_reg__2__MASK, 0x04 .set SCSI_Out_Bits_Sync_ctrl_reg__2__POS, 2 .set SCSI_Out_Bits_Sync_ctrl_reg__3__MASK, 0x08 @@ -1867,37 +1927,37 @@ .set SCSI_Out_Bits_Sync_ctrl_reg__6__POS, 6 .set SCSI_Out_Bits_Sync_ctrl_reg__7__MASK, 0x80 .set SCSI_Out_Bits_Sync_ctrl_reg__7__POS, 7 -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B1_UDB07_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG, CYREG_B1_UDB07_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B1_UDB07_ST_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG, CYREG_B1_UDB07_CTL -.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B1_UDB07_ST_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB02_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB02_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB02_ST_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB02_CTL +.set SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB02_ST_CTL .set SCSI_Out_Bits_Sync_ctrl_reg__MASK, 0xFF -.set SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B1_UDB07_MSK_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B1_UDB07_MSK_ACTL -.set SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG, CYREG_B1_UDB07_MSK +.set SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL +.set SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB02_MSK /* SCSI_Out_Ctl */ .set SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_Out_Ctl_Sync_ctrl_reg__0__POS, 0 -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B1_UDB04_05_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B1_UDB04_05_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B1_UDB04_05_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B1_UDB04_05_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B1_UDB04_05_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B1_UDB04_05_MSK -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B1_UDB04_05_MSK -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B1_UDB04_05_MSK -.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B1_UDB04_05_MSK -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B1_UDB04_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B1_UDB04_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B1_UDB04_ST_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B1_UDB04_CTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B1_UDB04_ST_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB01_02_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB01_02_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB01_02_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB01_02_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB01_02_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB01_02_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB01_02_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB01_02_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB01_02_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB01_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB01_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB01_ST_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB01_CTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB01_ST_CTL .set SCSI_Out_Ctl_Sync_ctrl_reg__MASK, 0x01 -.set SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B1_UDB04_MSK_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B1_UDB04_MSK_ACTL -.set SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B1_UDB04_MSK +.set SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB01_MSK_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB01_MSK_ACTL +.set SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB01_MSK /* SCSI_Out_DBx */ .set SCSI_Out_DBx__0__AG, CYREG_PRT5_AG @@ -1911,6 +1971,7 @@ .set SCSI_Out_DBx__0__DM2, CYREG_PRT5_DM2 .set SCSI_Out_DBx__0__DR, CYREG_PRT5_DR .set SCSI_Out_DBx__0__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Out_DBx__0__INTTYPE, CYREG_PICU5_INTTYPE1 .set SCSI_Out_DBx__0__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Out_DBx__0__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Out_DBx__0__MASK, 0x02 @@ -1938,6 +1999,7 @@ .set SCSI_Out_DBx__1__DM2, CYREG_PRT5_DM2 .set SCSI_Out_DBx__1__DR, CYREG_PRT5_DR .set SCSI_Out_DBx__1__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Out_DBx__1__INTTYPE, CYREG_PICU5_INTTYPE0 .set SCSI_Out_DBx__1__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Out_DBx__1__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Out_DBx__1__MASK, 0x01 @@ -1965,6 +2027,7 @@ .set SCSI_Out_DBx__2__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__2__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__2__INTTYPE, CYREG_PICU6_INTTYPE5 .set SCSI_Out_DBx__2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__2__MASK, 0x20 @@ -1992,6 +2055,7 @@ .set SCSI_Out_DBx__3__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__3__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__3__INTTYPE, CYREG_PICU6_INTTYPE4 .set SCSI_Out_DBx__3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__3__MASK, 0x10 @@ -2019,6 +2083,7 @@ .set SCSI_Out_DBx__4__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__4__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__4__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__4__INTTYPE, CYREG_PICU2_INTTYPE7 .set SCSI_Out_DBx__4__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__4__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__4__MASK, 0x80 @@ -2046,6 +2111,7 @@ .set SCSI_Out_DBx__5__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__5__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__5__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__5__INTTYPE, CYREG_PICU2_INTTYPE6 .set SCSI_Out_DBx__5__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__5__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__5__MASK, 0x40 @@ -2073,6 +2139,7 @@ .set SCSI_Out_DBx__6__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__6__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__6__INTTYPE, CYREG_PICU2_INTTYPE3 .set SCSI_Out_DBx__6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__6__MASK, 0x08 @@ -2100,6 +2167,7 @@ .set SCSI_Out_DBx__7__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__7__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__7__INTTYPE, CYREG_PICU2_INTTYPE2 .set SCSI_Out_DBx__7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__7__MASK, 0x04 @@ -2127,6 +2195,7 @@ .set SCSI_Out_DBx__DB0__DM2, CYREG_PRT5_DM2 .set SCSI_Out_DBx__DB0__DR, CYREG_PRT5_DR .set SCSI_Out_DBx__DB0__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Out_DBx__DB0__INTTYPE, CYREG_PICU5_INTTYPE1 .set SCSI_Out_DBx__DB0__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Out_DBx__DB0__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Out_DBx__DB0__MASK, 0x02 @@ -2154,6 +2223,7 @@ .set SCSI_Out_DBx__DB1__DM2, CYREG_PRT5_DM2 .set SCSI_Out_DBx__DB1__DR, CYREG_PRT5_DR .set SCSI_Out_DBx__DB1__INP_DIS, CYREG_PRT5_INP_DIS +.set SCSI_Out_DBx__DB1__INTTYPE, CYREG_PICU5_INTTYPE0 .set SCSI_Out_DBx__DB1__LCD_COM_SEG, CYREG_PRT5_LCD_COM_SEG .set SCSI_Out_DBx__DB1__LCD_EN, CYREG_PRT5_LCD_EN .set SCSI_Out_DBx__DB1__MASK, 0x01 @@ -2181,6 +2251,7 @@ .set SCSI_Out_DBx__DB2__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB2__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB2__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB2__INTTYPE, CYREG_PICU6_INTTYPE5 .set SCSI_Out_DBx__DB2__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB2__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB2__MASK, 0x20 @@ -2208,6 +2279,7 @@ .set SCSI_Out_DBx__DB3__DM2, CYREG_PRT6_DM2 .set SCSI_Out_DBx__DB3__DR, CYREG_PRT6_DR .set SCSI_Out_DBx__DB3__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Out_DBx__DB3__INTTYPE, CYREG_PICU6_INTTYPE4 .set SCSI_Out_DBx__DB3__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Out_DBx__DB3__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Out_DBx__DB3__MASK, 0x10 @@ -2235,6 +2307,7 @@ .set SCSI_Out_DBx__DB4__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__DB4__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__DB4__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__DB4__INTTYPE, CYREG_PICU2_INTTYPE7 .set SCSI_Out_DBx__DB4__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__DB4__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__DB4__MASK, 0x80 @@ -2262,6 +2335,7 @@ .set SCSI_Out_DBx__DB5__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__DB5__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__DB5__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__DB5__INTTYPE, CYREG_PICU2_INTTYPE6 .set SCSI_Out_DBx__DB5__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__DB5__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__DB5__MASK, 0x40 @@ -2289,6 +2363,7 @@ .set SCSI_Out_DBx__DB6__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__DB6__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__DB6__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__DB6__INTTYPE, CYREG_PICU2_INTTYPE3 .set SCSI_Out_DBx__DB6__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__DB6__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__DB6__MASK, 0x08 @@ -2316,6 +2391,7 @@ .set SCSI_Out_DBx__DB7__DM2, CYREG_PRT2_DM2 .set SCSI_Out_DBx__DB7__DR, CYREG_PRT2_DR .set SCSI_Out_DBx__DB7__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Out_DBx__DB7__INTTYPE, CYREG_PICU2_INTTYPE2 .set SCSI_Out_DBx__DB7__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Out_DBx__DB7__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Out_DBx__DB7__MASK, 0x04 @@ -2389,6 +2465,7 @@ .set SCSI_Noise__0__DM2, CYREG_PRT2_DM2 .set SCSI_Noise__0__DR, CYREG_PRT2_DR .set SCSI_Noise__0__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Noise__0__INTTYPE, CYREG_PICU2_INTTYPE0 .set SCSI_Noise__0__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Noise__0__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Noise__0__MASK, 0x01 @@ -2416,6 +2493,7 @@ .set SCSI_Noise__1__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__1__DR, CYREG_PRT6_DR .set SCSI_Noise__1__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__1__INTTYPE, CYREG_PICU6_INTTYPE3 .set SCSI_Noise__1__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__1__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__1__MASK, 0x08 @@ -2443,6 +2521,7 @@ .set SCSI_Noise__2__DM2, CYREG_PRT4_DM2 .set SCSI_Noise__2__DR, CYREG_PRT4_DR .set SCSI_Noise__2__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Noise__2__INTTYPE, CYREG_PICU4_INTTYPE3 .set SCSI_Noise__2__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Noise__2__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Noise__2__MASK, 0x08 @@ -2470,6 +2549,7 @@ .set SCSI_Noise__3__DM2, CYREG_PRT4_DM2 .set SCSI_Noise__3__DR, CYREG_PRT4_DR .set SCSI_Noise__3__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Noise__3__INTTYPE, CYREG_PICU4_INTTYPE7 .set SCSI_Noise__3__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Noise__3__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Noise__3__MASK, 0x80 @@ -2497,6 +2577,7 @@ .set SCSI_Noise__4__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__4__DR, CYREG_PRT6_DR .set SCSI_Noise__4__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__4__INTTYPE, CYREG_PICU6_INTTYPE2 .set SCSI_Noise__4__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__4__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__4__MASK, 0x04 @@ -2524,6 +2605,7 @@ .set SCSI_Noise__ACK__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__ACK__DR, CYREG_PRT6_DR .set SCSI_Noise__ACK__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__ACK__INTTYPE, CYREG_PICU6_INTTYPE2 .set SCSI_Noise__ACK__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__ACK__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__ACK__MASK, 0x04 @@ -2551,6 +2633,7 @@ .set SCSI_Noise__ATN__DM2, CYREG_PRT2_DM2 .set SCSI_Noise__ATN__DR, CYREG_PRT2_DR .set SCSI_Noise__ATN__INP_DIS, CYREG_PRT2_INP_DIS +.set SCSI_Noise__ATN__INTTYPE, CYREG_PICU2_INTTYPE0 .set SCSI_Noise__ATN__LCD_COM_SEG, CYREG_PRT2_LCD_COM_SEG .set SCSI_Noise__ATN__LCD_EN, CYREG_PRT2_LCD_EN .set SCSI_Noise__ATN__MASK, 0x01 @@ -2578,6 +2661,7 @@ .set SCSI_Noise__BSY__DM2, CYREG_PRT6_DM2 .set SCSI_Noise__BSY__DR, CYREG_PRT6_DR .set SCSI_Noise__BSY__INP_DIS, CYREG_PRT6_INP_DIS +.set SCSI_Noise__BSY__INTTYPE, CYREG_PICU6_INTTYPE3 .set SCSI_Noise__BSY__LCD_COM_SEG, CYREG_PRT6_LCD_COM_SEG .set SCSI_Noise__BSY__LCD_EN, CYREG_PRT6_LCD_EN .set SCSI_Noise__BSY__MASK, 0x08 @@ -2605,6 +2689,7 @@ .set SCSI_Noise__RST__DM2, CYREG_PRT4_DM2 .set SCSI_Noise__RST__DR, CYREG_PRT4_DR .set SCSI_Noise__RST__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Noise__RST__INTTYPE, CYREG_PICU4_INTTYPE7 .set SCSI_Noise__RST__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Noise__RST__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Noise__RST__MASK, 0x80 @@ -2632,6 +2717,7 @@ .set SCSI_Noise__SEL__DM2, CYREG_PRT4_DM2 .set SCSI_Noise__SEL__DR, CYREG_PRT4_DR .set SCSI_Noise__SEL__INP_DIS, CYREG_PRT4_INP_DIS +.set SCSI_Noise__SEL__INTTYPE, CYREG_PICU4_INTTYPE3 .set SCSI_Noise__SEL__LCD_COM_SEG, CYREG_PRT4_LCD_COM_SEG .set SCSI_Noise__SEL__LCD_EN, CYREG_PRT4_LCD_EN .set SCSI_Noise__SEL__MASK, 0x08 @@ -2699,8 +2785,8 @@ .set scsiTarget_StatusReg__0__POS, 0 .set scsiTarget_StatusReg__1__MASK, 0x02 .set scsiTarget_StatusReg__1__POS, 1 -.set scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB07_08_ACTL -.set scsiTarget_StatusReg__16BIT_STATUS_REG, CYREG_B0_UDB07_08_ST +.set scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB03_04_ACTL +.set scsiTarget_StatusReg__16BIT_STATUS_REG, CYREG_B0_UDB03_04_ST .set scsiTarget_StatusReg__2__MASK, 0x04 .set scsiTarget_StatusReg__2__POS, 2 .set scsiTarget_StatusReg__3__MASK, 0x08 @@ -2708,9 +2794,9 @@ .set scsiTarget_StatusReg__4__MASK, 0x10 .set scsiTarget_StatusReg__4__POS, 4 .set scsiTarget_StatusReg__MASK, 0x1F -.set scsiTarget_StatusReg__MASK_REG, CYREG_B0_UDB07_MSK -.set scsiTarget_StatusReg__STATUS_AUX_CTL_REG, CYREG_B0_UDB07_ACTL -.set scsiTarget_StatusReg__STATUS_REG, CYREG_B0_UDB07_ST +.set scsiTarget_StatusReg__MASK_REG, CYREG_B0_UDB03_MSK +.set scsiTarget_StatusReg__STATUS_AUX_CTL_REG, CYREG_B0_UDB03_ACTL +.set scsiTarget_StatusReg__STATUS_REG, CYREG_B0_UDB03_ST /* Debug_Timer_Interrupt */ .set Debug_Timer_Interrupt__INTC_CLR_EN_REG, CYREG_NVIC_CLRENA0 @@ -2831,8 +2917,8 @@ .set SCSI_Filtered_sts_sts_reg__0__POS, 0 .set SCSI_Filtered_sts_sts_reg__1__MASK, 0x02 .set SCSI_Filtered_sts_sts_reg__1__POS, 1 -.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB11_12_ACTL -.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB11_12_ST +.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB02_03_ACTL +.set SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB02_03_ST .set SCSI_Filtered_sts_sts_reg__2__MASK, 0x04 .set SCSI_Filtered_sts_sts_reg__2__POS, 2 .set SCSI_Filtered_sts_sts_reg__3__MASK, 0x08 @@ -2840,77 +2926,81 @@ .set SCSI_Filtered_sts_sts_reg__4__MASK, 0x10 .set SCSI_Filtered_sts_sts_reg__4__POS, 4 .set SCSI_Filtered_sts_sts_reg__MASK, 0x1F -.set SCSI_Filtered_sts_sts_reg__MASK_REG, CYREG_B0_UDB11_MSK -.set SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB11_ACTL -.set SCSI_Filtered_sts_sts_reg__STATUS_REG, CYREG_B0_UDB11_ST +.set SCSI_Filtered_sts_sts_reg__MASK_REG, CYREG_B0_UDB02_MSK +.set SCSI_Filtered_sts_sts_reg__MASK_ST_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL +.set SCSI_Filtered_sts_sts_reg__PER_ST_AUX_CTL_REG, CYREG_B0_UDB02_MSK_ACTL +.set SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB02_ACTL +.set SCSI_Filtered_sts_sts_reg__STATUS_CNT_REG, CYREG_B0_UDB02_ST_CTL +.set SCSI_Filtered_sts_sts_reg__STATUS_CONTROL_REG, CYREG_B0_UDB02_ST_CTL +.set SCSI_Filtered_sts_sts_reg__STATUS_REG, CYREG_B0_UDB02_ST /* SCSI_CTL_PHASE */ .set SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS, 0 .set SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK, 0x02 .set SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS, 1 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB05_06_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB05_06_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB05_06_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB05_06_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB05_06_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB05_06_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB05_06_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB05_06_MSK -.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB05_06_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB12_13_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB12_13_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB12_13_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB12_13_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB12_13_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB12_13_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB12_13_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB12_13_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB12_13_MSK .set SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK, 0x04 .set SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS, 2 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB05_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB05_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB05_ST_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB05_CTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB05_ST_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB12_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB12_ST_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB12_CTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB12_ST_CTL .set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK, 0x07 -.set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB05_MSK_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB05_MSK_ACTL -.set SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB05_MSK +.set SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB12_MSK_ACTL +.set SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB12_MSK /* SCSI_Glitch_Ctl */ .set SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK, 0x01 .set SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS, 0 -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB06_07_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB06_07_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB06_07_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB06_07_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB06_07_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB06_07_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB06_07_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB06_07_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB06_07_MSK -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB06_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB06_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB06_ST_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB06_CTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB06_ST_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG, CYREG_B0_UDB13_14_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG, CYREG_B0_UDB13_14_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG, CYREG_B0_UDB13_14_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG, CYREG_B0_UDB13_14_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG, CYREG_B0_UDB13_14_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG, CYREG_B0_UDB13_14_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG, CYREG_B0_UDB13_14_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG, CYREG_B0_UDB13_14_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG, CYREG_B0_UDB13_14_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG, CYREG_B0_UDB13_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG, CYREG_B0_UDB13_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG, CYREG_B0_UDB13_ST_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG, CYREG_B0_UDB13_CTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG, CYREG_B0_UDB13_ST_CTL .set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK, 0x01 -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB06_MSK_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB06_MSK_ACTL -.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB06_MSK +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG, CYREG_B0_UDB13_MSK_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG, CYREG_B0_UDB13_MSK_ACTL +.set SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG, CYREG_B0_UDB13_MSK /* SCSI_Parity_Error */ .set SCSI_Parity_Error_sts_sts_reg__0__MASK, 0x01 .set SCSI_Parity_Error_sts_sts_reg__0__POS, 0 -.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB10_11_ACTL -.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB10_11_ST +.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG, CYREG_B0_UDB11_12_ACTL +.set SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG, CYREG_B0_UDB11_12_ST .set SCSI_Parity_Error_sts_sts_reg__MASK, 0x01 -.set SCSI_Parity_Error_sts_sts_reg__MASK_REG, CYREG_B0_UDB10_MSK -.set SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB10_ACTL -.set SCSI_Parity_Error_sts_sts_reg__STATUS_REG, CYREG_B0_UDB10_ST +.set SCSI_Parity_Error_sts_sts_reg__MASK_REG, CYREG_B0_UDB11_MSK +.set SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG, CYREG_B0_UDB11_ACTL +.set SCSI_Parity_Error_sts_sts_reg__STATUS_REG, CYREG_B0_UDB11_ST /* Miscellaneous */ .set BCLK__BUS_CLK__HZ, 50000000 .set BCLK__BUS_CLK__KHZ, 50000 .set BCLK__BUS_CLK__MHZ, 50 -.set CYDEV_CHIP_DIE_GEN4, 2 .set CYDEV_CHIP_DIE_LEOPARD, 1 -.set CYDEV_CHIP_DIE_PANTHER, 12 -.set CYDEV_CHIP_DIE_PSOC4A, 5 -.set CYDEV_CHIP_DIE_PSOC5LP, 11 +.set CYDEV_CHIP_DIE_PANTHER, 18 +.set CYDEV_CHIP_DIE_PSOC4A, 10 +.set CYDEV_CHIP_DIE_PSOC5LP, 17 +.set CYDEV_CHIP_DIE_TMA4, 2 .set CYDEV_CHIP_DIE_UNKNOWN, 0 .set CYDEV_CHIP_FAMILY_PSOC3, 1 .set CYDEV_CHIP_FAMILY_PSOC4, 2 @@ -2919,23 +3009,26 @@ .set CYDEV_CHIP_FAMILY_USED, CYDEV_CHIP_FAMILY_PSOC5 .set CYDEV_CHIP_JTAG_ID, 0x2E133069 .set CYDEV_CHIP_MEMBER_3A, 1 -.set CYDEV_CHIP_MEMBER_4A, 5 -.set CYDEV_CHIP_MEMBER_4C, 9 -.set CYDEV_CHIP_MEMBER_4D, 3 +.set CYDEV_CHIP_MEMBER_4A, 10 +.set CYDEV_CHIP_MEMBER_4C, 15 +.set CYDEV_CHIP_MEMBER_4D, 6 .set CYDEV_CHIP_MEMBER_4E, 4 -.set CYDEV_CHIP_MEMBER_4F, 6 +.set CYDEV_CHIP_MEMBER_4F, 11 .set CYDEV_CHIP_MEMBER_4G, 2 -.set CYDEV_CHIP_MEMBER_4L, 8 -.set CYDEV_CHIP_MEMBER_4M, 7 -.set CYDEV_CHIP_MEMBER_5A, 11 -.set CYDEV_CHIP_MEMBER_5B, 10 +.set CYDEV_CHIP_MEMBER_4H, 9 +.set CYDEV_CHIP_MEMBER_4I, 14 +.set CYDEV_CHIP_MEMBER_4J, 7 +.set CYDEV_CHIP_MEMBER_4K, 8 +.set CYDEV_CHIP_MEMBER_4L, 13 +.set CYDEV_CHIP_MEMBER_4M, 12 +.set CYDEV_CHIP_MEMBER_4N, 5 +.set CYDEV_CHIP_MEMBER_4U, 3 +.set CYDEV_CHIP_MEMBER_5A, 17 +.set CYDEV_CHIP_MEMBER_5B, 16 .set CYDEV_CHIP_MEMBER_UNKNOWN, 0 .set CYDEV_CHIP_MEMBER_USED, CYDEV_CHIP_MEMBER_5B .set CYDEV_CHIP_DIE_EXPECT, CYDEV_CHIP_MEMBER_USED .set CYDEV_CHIP_DIE_ACTUAL, CYDEV_CHIP_DIE_EXPECT -.set CYDEV_CHIP_REV_GEN4_ES, 17 -.set CYDEV_CHIP_REV_GEN4_ES2, 33 -.set CYDEV_CHIP_REV_GEN4_PRODUCTION, 17 .set CYDEV_CHIP_REV_LEOPARD_ES1, 0 .set CYDEV_CHIP_REV_LEOPARD_ES2, 1 .set CYDEV_CHIP_REV_LEOPARD_ES3, 3 @@ -2947,6 +3040,9 @@ .set CYDEV_CHIP_REV_PSOC4A_PRODUCTION, 17 .set CYDEV_CHIP_REV_PSOC5LP_ES0, 0 .set CYDEV_CHIP_REV_PSOC5LP_PRODUCTION, 0 +.set CYDEV_CHIP_REV_TMA4_ES, 17 +.set CYDEV_CHIP_REV_TMA4_ES2, 33 +.set CYDEV_CHIP_REV_TMA4_PRODUCTION, 17 .set CYDEV_CHIP_REVISION_3A_ES1, 0 .set CYDEV_CHIP_REVISION_3A_ES2, 1 .set CYDEV_CHIP_REVISION_3A_ES3, 3 @@ -2957,12 +3053,19 @@ .set CYDEV_CHIP_REVISION_4D_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4E_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4F_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA, 0 .set CYDEV_CHIP_REVISION_4F_PRODUCTION_256K, 0 .set CYDEV_CHIP_REVISION_4G_ES, 17 .set CYDEV_CHIP_REVISION_4G_ES2, 33 .set CYDEV_CHIP_REVISION_4G_PRODUCTION, 17 +.set CYDEV_CHIP_REVISION_4H_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4I_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4J_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4K_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4L_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_4M_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4N_PRODUCTION, 0 +.set CYDEV_CHIP_REVISION_4U_PRODUCTION, 0 .set CYDEV_CHIP_REVISION_5A_ES0, 0 .set CYDEV_CHIP_REVISION_5A_ES1, 1 .set CYDEV_CHIP_REVISION_5A_PRODUCTION, 1 @@ -2995,6 +3098,8 @@ .set CYDEV_HEAP_SIZE, 0x0400 .set CYDEV_INSTRUCT_CACHE_ENABLED, 1 .set CYDEV_INTR_RISING, 0x0000007E +.set CYDEV_IS_EXPORTING_CODE, 0 +.set CYDEV_IS_IMPORTING_CODE, 0 .set CYDEV_PROJ_TYPE, 2 .set CYDEV_PROJ_TYPE_BOOTLOADER, 1 .set CYDEV_PROJ_TYPE_LAUNCHER, 5 @@ -3007,14 +3112,22 @@ .set CYDEV_USB_CLK_OSC_LOCKING_ENABLED_AT_PWR_UP, 1 .set CYDEV_USE_BUNDLED_CMSIS, 1 .set CYDEV_VARIABLE_VDDA, 0 +.set CYDEV_VDDA, 5 .set CYDEV_VDDA_MV, 5000 +.set CYDEV_VDDD, 5 .set CYDEV_VDDD_MV, 5000 +.set CYDEV_VDDIO0, 5 .set CYDEV_VDDIO0_MV, 5000 +.set CYDEV_VDDIO1, 5 .set CYDEV_VDDIO1_MV, 5000 +.set CYDEV_VDDIO2, 5 .set CYDEV_VDDIO2_MV, 5000 .set CYDEV_VDDIO3_MV, 3300 +.set CYDEV_VIO0, 5 .set CYDEV_VIO0_MV, 5000 +.set CYDEV_VIO1, 5 .set CYDEV_VIO1_MV, 5000 +.set CYDEV_VIO2, 5 .set CYDEV_VIO2_MV, 5000 .set CYDEV_VIO3_MV, 3300 .set CYIPBLOCK_ARM_CM3_VERSION, 0 diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc index 62b3c23a..789a9f8d 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc @@ -4,6 +4,7 @@ INCLUDE cydeviceiar_trm.inc /* LED1 */ +LED1__0__INTTYPE EQU CYREG_PICU0_INTTYPE1 LED1__0__MASK EQU 0x02 LED1__0__PC EQU CYREG_PRT0_PC1 LED1__0__PORT EQU 0 @@ -19,6 +20,7 @@ LED1__DM1 EQU CYREG_PRT0_DM1 LED1__DM2 EQU CYREG_PRT0_DM2 LED1__DR EQU CYREG_PRT0_DR LED1__INP_DIS EQU CYREG_PRT0_INP_DIS +LED1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU0_BASE LED1__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG LED1__LCD_EN EQU CYREG_PRT0_LCD_EN LED1__MASK EQU 0x02 @@ -36,6 +38,7 @@ LED1__SHIFT EQU 1 LED1__SLW EQU CYREG_PRT0_SLW /* SD_CD */ +SD_CD__0__INTTYPE EQU CYREG_PICU3_INTTYPE5 SD_CD__0__MASK EQU 0x20 SD_CD__0__PC EQU CYREG_PRT3_PC5 SD_CD__0__PORT EQU 3 @@ -51,6 +54,7 @@ SD_CD__DM1 EQU CYREG_PRT3_DM1 SD_CD__DM2 EQU CYREG_PRT3_DM2 SD_CD__DR EQU CYREG_PRT3_DR SD_CD__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CD__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CD__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CD__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CD__MASK EQU 0x20 @@ -68,6 +72,7 @@ SD_CD__SHIFT EQU 5 SD_CD__SLW EQU CYREG_PRT3_SLW /* SD_CS */ +SD_CS__0__INTTYPE EQU CYREG_PICU3_INTTYPE4 SD_CS__0__MASK EQU 0x10 SD_CS__0__PC EQU CYREG_PRT3_PC4 SD_CS__0__PORT EQU 3 @@ -83,6 +88,7 @@ SD_CS__DM1 EQU CYREG_PRT3_DM1 SD_CS__DM2 EQU CYREG_PRT3_DM2 SD_CS__DR EQU CYREG_PRT3_DR SD_CS__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CS__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CS__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CS__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CS__MASK EQU 0x10 @@ -120,6 +126,7 @@ USBFS_bus_reset__INTC_SET_EN_REG EQU CYREG_NVIC_SETENA0 USBFS_bus_reset__INTC_SET_PD_REG EQU CYREG_NVIC_SETPEND0 /* USBFS_Dm */ +USBFS_Dm__0__INTTYPE EQU CYREG_PICU15_INTTYPE7 USBFS_Dm__0__MASK EQU 0x80 USBFS_Dm__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC1 USBFS_Dm__0__PORT EQU 15 @@ -135,6 +142,7 @@ USBFS_Dm__DM1 EQU CYREG_PRT15_DM1 USBFS_Dm__DM2 EQU CYREG_PRT15_DM2 USBFS_Dm__DR EQU CYREG_PRT15_DR USBFS_Dm__INP_DIS EQU CYREG_PRT15_INP_DIS +USBFS_Dm__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dm__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dm__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dm__MASK EQU 0x80 @@ -152,6 +160,7 @@ USBFS_Dm__SHIFT EQU 7 USBFS_Dm__SLW EQU CYREG_PRT15_SLW /* USBFS_Dp */ +USBFS_Dp__0__INTTYPE EQU CYREG_PICU15_INTTYPE6 USBFS_Dp__0__MASK EQU 0x40 USBFS_Dp__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC0 USBFS_Dp__0__PORT EQU 15 @@ -168,6 +177,7 @@ USBFS_Dp__DM2 EQU CYREG_PRT15_DM2 USBFS_Dp__DR EQU CYREG_PRT15_DR USBFS_Dp__INP_DIS EQU CYREG_PRT15_INP_DIS USBFS_Dp__INTSTAT EQU CYREG_PICU15_INTSTAT +USBFS_Dp__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dp__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dp__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dp__MASK EQU 0x40 @@ -382,6 +392,7 @@ USBFS_USB__USBIO_CR0 EQU CYREG_USB_USBIO_CR0 USBFS_USB__USBIO_CR1 EQU CYREG_USB_USBIO_CR1 /* EXTLED */ +EXTLED__0__INTTYPE EQU CYREG_PICU0_INTTYPE0 EXTLED__0__MASK EQU 0x01 EXTLED__0__PC EQU CYREG_PRT0_PC0 EXTLED__0__PORT EQU 0 @@ -397,6 +408,7 @@ EXTLED__DM1 EQU CYREG_PRT0_DM1 EXTLED__DM2 EQU CYREG_PRT0_DM2 EXTLED__DR EQU CYREG_PRT0_DR EXTLED__INP_DIS EQU CYREG_PRT0_INP_DIS +EXTLED__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU0_BASE EXTLED__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG EXTLED__LCD_EN EQU CYREG_PRT0_LCD_EN EXTLED__MASK EQU 0x01 @@ -414,34 +426,34 @@ EXTLED__SHIFT EQU 0 EXTLED__SLW EQU CYREG_PRT0_SLW /* SDCard_BSPIM */ -SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL -SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B0_UDB12_CTL -SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B0_UDB12_CTL -SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B0_UDB12_MSK -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B0_UDB12_13_ST -SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B0_UDB12_MSK -SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B0_UDB12_ST -SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_08_ACTL -SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB07_08_ST +SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL +SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B1_UDB06_CTL +SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B1_UDB06_CTL +SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B1_UDB06_MSK +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B1_UDB06_07_ST +SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B1_UDB06_MSK +SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B1_UDB06_ST +SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST SDCard_BSPIM_RxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_RxStsReg__4__POS EQU 4 SDCard_BSPIM_RxStsReg__5__MASK EQU 0x20 @@ -449,13 +461,9 @@ SDCard_BSPIM_RxStsReg__5__POS EQU 5 SDCard_BSPIM_RxStsReg__6__MASK EQU 0x40 SDCard_BSPIM_RxStsReg__6__POS EQU 6 SDCard_BSPIM_RxStsReg__MASK EQU 0x70 -SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB07_MSK -SDCard_BSPIM_RxStsReg__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SDCard_BSPIM_RxStsReg__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL -SDCard_BSPIM_RxStsReg__STATUS_CNT_REG EQU CYREG_B1_UDB07_ST_CTL -SDCard_BSPIM_RxStsReg__STATUS_CONTROL_REG EQU CYREG_B1_UDB07_ST_CTL -SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB07_ST +SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B0_UDB07_ST SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG EQU CYREG_B1_UDB04_05_A0 SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG EQU CYREG_B1_UDB04_05_A1 SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG EQU CYREG_B1_UDB04_05_D0 @@ -473,12 +481,12 @@ SDCard_BSPIM_sR8_Dp_u0__DP_AUX_CTL_REG EQU CYREG_B1_UDB04_ACTL SDCard_BSPIM_sR8_Dp_u0__F0_F1_REG EQU CYREG_B1_UDB04_F0_F1 SDCard_BSPIM_sR8_Dp_u0__F0_REG EQU CYREG_B1_UDB04_F0 SDCard_BSPIM_sR8_Dp_u0__F1_REG EQU CYREG_B1_UDB04_F1 -SDCard_BSPIM_sR8_Dp_u0__MSK_DP_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SDCard_BSPIM_sR8_Dp_u0__PER_DP_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL SDCard_BSPIM_TxStsReg__0__MASK EQU 0x01 SDCard_BSPIM_TxStsReg__0__POS EQU 0 SDCard_BSPIM_TxStsReg__1__MASK EQU 0x02 SDCard_BSPIM_TxStsReg__1__POS EQU 1 +SDCard_BSPIM_TxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL +SDCard_BSPIM_TxStsReg__16BIT_STATUS_REG EQU CYREG_B0_UDB04_05_ST SDCard_BSPIM_TxStsReg__2__MASK EQU 0x04 SDCard_BSPIM_TxStsReg__2__POS EQU 2 SDCard_BSPIM_TxStsReg__3__MASK EQU 0x08 @@ -486,11 +494,12 @@ SDCard_BSPIM_TxStsReg__3__POS EQU 3 SDCard_BSPIM_TxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_TxStsReg__4__POS EQU 4 SDCard_BSPIM_TxStsReg__MASK EQU 0x1F -SDCard_BSPIM_TxStsReg__MASK_REG EQU CYREG_B1_UDB11_MSK -SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB11_ACTL -SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B1_UDB11_ST +SDCard_BSPIM_TxStsReg__MASK_REG EQU CYREG_B0_UDB04_MSK +SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL +SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B0_UDB04_ST /* SD_SCK */ +SD_SCK__0__INTTYPE EQU CYREG_PICU3_INTTYPE2 SD_SCK__0__MASK EQU 0x04 SD_SCK__0__PC EQU CYREG_PRT3_PC2 SD_SCK__0__PORT EQU 3 @@ -506,6 +515,7 @@ SD_SCK__DM1 EQU CYREG_PRT3_DM1 SD_SCK__DM2 EQU CYREG_PRT3_DM2 SD_SCK__DR EQU CYREG_PRT3_DR SD_SCK__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_SCK__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_SCK__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_SCK__LCD_EN EQU CYREG_PRT3_LCD_EN SD_SCK__MASK EQU 0x04 @@ -534,6 +544,7 @@ SCSI_In__0__DM1 EQU CYREG_PRT2_DM1 SCSI_In__0__DM2 EQU CYREG_PRT2_DM2 SCSI_In__0__DR EQU CYREG_PRT2_DR SCSI_In__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__0__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__0__MASK EQU 0x02 @@ -561,6 +572,7 @@ SCSI_In__1__DM1 EQU CYREG_PRT4_DM1 SCSI_In__1__DM2 EQU CYREG_PRT4_DM2 SCSI_In__1__DR EQU CYREG_PRT4_DR SCSI_In__1__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__1__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_In__1__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__1__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__1__MASK EQU 0x40 @@ -588,6 +600,7 @@ SCSI_In__2__DM1 EQU CYREG_PRT4_DM1 SCSI_In__2__DM2 EQU CYREG_PRT4_DM2 SCSI_In__2__DR EQU CYREG_PRT4_DR SCSI_In__2__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__2__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_In__2__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__2__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__2__MASK EQU 0x04 @@ -615,6 +628,7 @@ SCSI_In__3__DM1 EQU CYREG_PRT0_DM1 SCSI_In__3__DM2 EQU CYREG_PRT0_DM2 SCSI_In__3__DR EQU CYREG_PRT0_DR SCSI_In__3__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__3__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_In__3__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__3__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__3__MASK EQU 0x20 @@ -642,6 +656,7 @@ SCSI_In__4__DM1 EQU CYREG_PRT0_DM1 SCSI_In__4__DM2 EQU CYREG_PRT0_DM2 SCSI_In__4__DR EQU CYREG_PRT0_DR SCSI_In__4__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__4__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_In__4__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__4__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__4__MASK EQU 0x10 @@ -669,6 +684,7 @@ SCSI_In__CD__DM1 EQU CYREG_PRT4_DM1 SCSI_In__CD__DM2 EQU CYREG_PRT4_DM2 SCSI_In__CD__DR EQU CYREG_PRT4_DR SCSI_In__CD__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__CD__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_In__CD__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__CD__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__CD__MASK EQU 0x04 @@ -696,6 +712,7 @@ SCSI_In__DBP__DM1 EQU CYREG_PRT2_DM1 SCSI_In__DBP__DM2 EQU CYREG_PRT2_DM2 SCSI_In__DBP__DR EQU CYREG_PRT2_DR SCSI_In__DBP__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__DBP__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In__DBP__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__DBP__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__DBP__MASK EQU 0x02 @@ -723,6 +740,7 @@ SCSI_In__IO__DM1 EQU CYREG_PRT0_DM1 SCSI_In__IO__DM2 EQU CYREG_PRT0_DM2 SCSI_In__IO__DR EQU CYREG_PRT0_DR SCSI_In__IO__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__IO__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_In__IO__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__IO__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__IO__MASK EQU 0x10 @@ -750,6 +768,7 @@ SCSI_In__MSG__DM1 EQU CYREG_PRT4_DM1 SCSI_In__MSG__DM2 EQU CYREG_PRT4_DM2 SCSI_In__MSG__DR EQU CYREG_PRT4_DR SCSI_In__MSG__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__MSG__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_In__MSG__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__MSG__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__MSG__MASK EQU 0x40 @@ -777,6 +796,7 @@ SCSI_In__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_In__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_In__REQ__DR EQU CYREG_PRT0_DR SCSI_In__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_In__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__REQ__MASK EQU 0x20 @@ -806,6 +826,7 @@ SCSI_In_DBx__0__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__0__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__0__DR EQU CYREG_PRT5_DR SCSI_In_DBx__0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__0__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In_DBx__0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__0__MASK EQU 0x08 @@ -833,6 +854,7 @@ SCSI_In_DBx__1__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__1__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__1__DR EQU CYREG_PRT5_DR SCSI_In_DBx__1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__1__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In_DBx__1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__1__MASK EQU 0x04 @@ -860,6 +882,7 @@ SCSI_In_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__2__DR EQU CYREG_PRT6_DR SCSI_In_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__2__MASK EQU 0x80 @@ -887,6 +910,7 @@ SCSI_In_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__3__DR EQU CYREG_PRT6_DR SCSI_In_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_In_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__3__MASK EQU 0x40 @@ -912,6 +936,7 @@ SCSI_In_DBx__4__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__4__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__4__DR EQU CYREG_PRT12_DR SCSI_In_DBx__4__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__4__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_In_DBx__4__MASK EQU 0x20 SCSI_In_DBx__4__PC EQU CYREG_PRT12_PC5 SCSI_In_DBx__4__PORT EQU 12 @@ -938,6 +963,7 @@ SCSI_In_DBx__5__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__5__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__5__DR EQU CYREG_PRT12_DR SCSI_In_DBx__5__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__5__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__5__MASK EQU 0x10 SCSI_In_DBx__5__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__5__PORT EQU 12 @@ -966,6 +992,7 @@ SCSI_In_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__6__MASK EQU 0x20 @@ -993,6 +1020,7 @@ SCSI_In_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__7__MASK EQU 0x10 @@ -1020,6 +1048,7 @@ SCSI_In_DBx__DB0__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__DB0__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__DB0__DR EQU CYREG_PRT5_DR SCSI_In_DBx__DB0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__DB0__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__DB0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__DB0__MASK EQU 0x08 @@ -1047,6 +1076,7 @@ SCSI_In_DBx__DB1__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__DB1__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__DB1__DR EQU CYREG_PRT5_DR SCSI_In_DBx__DB1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__DB1__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__DB1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__DB1__MASK EQU 0x04 @@ -1074,6 +1104,7 @@ SCSI_In_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_In_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__DB2__MASK EQU 0x80 @@ -1101,6 +1132,7 @@ SCSI_In_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_In_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_In_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__DB3__MASK EQU 0x40 @@ -1126,6 +1158,7 @@ SCSI_In_DBx__DB4__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB4__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB4__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB4__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB4__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_In_DBx__DB4__MASK EQU 0x20 SCSI_In_DBx__DB4__PC EQU CYREG_PRT12_PC5 SCSI_In_DBx__DB4__PORT EQU 12 @@ -1152,6 +1185,7 @@ SCSI_In_DBx__DB5__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB5__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB5__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB5__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB5__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__DB5__MASK EQU 0x10 SCSI_In_DBx__DB5__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__DB5__PORT EQU 12 @@ -1180,6 +1214,7 @@ SCSI_In_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB6__MASK EQU 0x20 @@ -1207,6 +1242,7 @@ SCSI_In_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB7__MASK EQU 0x10 @@ -1225,6 +1261,7 @@ SCSI_In_DBx__DB7__SHIFT EQU 4 SCSI_In_DBx__DB7__SLW EQU CYREG_PRT2_SLW /* SD_MISO */ +SD_MISO__0__INTTYPE EQU CYREG_PICU3_INTTYPE1 SD_MISO__0__MASK EQU 0x02 SD_MISO__0__PC EQU CYREG_PRT3_PC1 SD_MISO__0__PORT EQU 3 @@ -1240,6 +1277,7 @@ SD_MISO__DM1 EQU CYREG_PRT3_DM1 SD_MISO__DM2 EQU CYREG_PRT3_DM2 SD_MISO__DR EQU CYREG_PRT3_DR SD_MISO__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MISO__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MISO__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MISO__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MISO__MASK EQU 0x02 @@ -1257,6 +1295,7 @@ SD_MISO__SHIFT EQU 1 SD_MISO__SLW EQU CYREG_PRT3_SLW /* SD_MOSI */ +SD_MOSI__0__INTTYPE EQU CYREG_PICU3_INTTYPE3 SD_MOSI__0__MASK EQU 0x08 SD_MOSI__0__PC EQU CYREG_PRT3_PC3 SD_MOSI__0__PORT EQU 3 @@ -1272,6 +1311,7 @@ SD_MOSI__DM1 EQU CYREG_PRT3_DM1 SD_MOSI__DM2 EQU CYREG_PRT3_DM2 SD_MOSI__DR EQU CYREG_PRT3_DR SD_MOSI__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MOSI__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MOSI__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MOSI__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MOSI__MASK EQU 0x08 @@ -1311,6 +1351,7 @@ SCSI_Out__0__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__0__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__0__DR EQU CYREG_PRT15_DR SCSI_Out__0__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__0__INTTYPE EQU CYREG_PICU15_INTTYPE5 SCSI_Out__0__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__0__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__0__MASK EQU 0x20 @@ -1338,6 +1379,7 @@ SCSI_Out__1__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__1__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__1__DR EQU CYREG_PRT15_DR SCSI_Out__1__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__1__INTTYPE EQU CYREG_PICU15_INTTYPE4 SCSI_Out__1__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__1__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__1__MASK EQU 0x10 @@ -1365,6 +1407,7 @@ SCSI_Out__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__2__DR EQU CYREG_PRT6_DR SCSI_Out__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__2__MASK EQU 0x02 @@ -1392,6 +1435,7 @@ SCSI_Out__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__3__DR EQU CYREG_PRT6_DR SCSI_Out__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__3__MASK EQU 0x01 @@ -1419,6 +1463,7 @@ SCSI_Out__4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__4__DR EQU CYREG_PRT4_DR SCSI_Out__4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__4__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out__4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__4__MASK EQU 0x20 @@ -1446,6 +1491,7 @@ SCSI_Out__5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__5__DR EQU CYREG_PRT4_DR SCSI_Out__5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__5__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out__5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__5__MASK EQU 0x10 @@ -1473,6 +1519,7 @@ SCSI_Out__6__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__6__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__6__DR EQU CYREG_PRT0_DR SCSI_Out__6__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__6__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__6__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__6__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__6__MASK EQU 0x80 @@ -1500,6 +1547,7 @@ SCSI_Out__7__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__7__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__7__DR EQU CYREG_PRT0_DR SCSI_Out__7__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__7__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__7__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__7__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__7__MASK EQU 0x40 @@ -1527,6 +1575,7 @@ SCSI_Out__8__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__8__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__8__DR EQU CYREG_PRT0_DR SCSI_Out__8__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__8__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__8__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__8__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__8__MASK EQU 0x08 @@ -1554,6 +1603,7 @@ SCSI_Out__9__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__9__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__9__DR EQU CYREG_PRT0_DR SCSI_Out__9__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__9__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__9__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__9__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__9__MASK EQU 0x04 @@ -1581,6 +1631,7 @@ SCSI_Out__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__ACK__DR EQU CYREG_PRT6_DR SCSI_Out__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__ACK__MASK EQU 0x01 @@ -1608,6 +1659,7 @@ SCSI_Out__ATN__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__ATN__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__ATN__DR EQU CYREG_PRT15_DR SCSI_Out__ATN__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__ATN__INTTYPE EQU CYREG_PICU15_INTTYPE4 SCSI_Out__ATN__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__ATN__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__ATN__MASK EQU 0x10 @@ -1635,6 +1687,7 @@ SCSI_Out__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__BSY__DR EQU CYREG_PRT6_DR SCSI_Out__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__BSY__MASK EQU 0x02 @@ -1662,6 +1715,7 @@ SCSI_Out__CD_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__CD_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__CD_raw__DR EQU CYREG_PRT0_DR SCSI_Out__CD_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__CD_raw__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__CD_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__CD_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__CD_raw__MASK EQU 0x40 @@ -1689,6 +1743,7 @@ SCSI_Out__DBP_raw__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__DBP_raw__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__DBP_raw__DR EQU CYREG_PRT15_DR SCSI_Out__DBP_raw__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__DBP_raw__INTTYPE EQU CYREG_PICU15_INTTYPE5 SCSI_Out__DBP_raw__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__DBP_raw__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__DBP_raw__MASK EQU 0x20 @@ -1716,6 +1771,7 @@ SCSI_Out__IO_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__IO_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__IO_raw__DR EQU CYREG_PRT0_DR SCSI_Out__IO_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__IO_raw__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__IO_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__IO_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__IO_raw__MASK EQU 0x04 @@ -1743,6 +1799,7 @@ SCSI_Out__MSG_raw__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__MSG_raw__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__MSG_raw__DR EQU CYREG_PRT4_DR SCSI_Out__MSG_raw__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__MSG_raw__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out__MSG_raw__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__MSG_raw__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__MSG_raw__MASK EQU 0x10 @@ -1770,6 +1827,7 @@ SCSI_Out__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__REQ__DR EQU CYREG_PRT0_DR SCSI_Out__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__REQ__MASK EQU 0x08 @@ -1797,6 +1855,7 @@ SCSI_Out__RST__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__RST__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__RST__DR EQU CYREG_PRT4_DR SCSI_Out__RST__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__RST__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out__RST__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__RST__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__RST__MASK EQU 0x20 @@ -1824,6 +1883,7 @@ SCSI_Out__SEL__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__SEL__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__SEL__DR EQU CYREG_PRT0_DR SCSI_Out__SEL__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__SEL__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__SEL__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__SEL__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__SEL__MASK EQU 0x80 @@ -1846,15 +1906,15 @@ SCSI_Out_Bits_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Bits_Sync_ctrl_reg__0__POS EQU 0 SCSI_Out_Bits_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_Out_Bits_Sync_ctrl_reg__1__POS EQU 1 -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB07_08_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB07_08_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK SCSI_Out_Bits_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_Out_Bits_Sync_ctrl_reg__2__POS EQU 2 SCSI_Out_Bits_Sync_ctrl_reg__3__MASK EQU 0x08 @@ -1867,37 +1927,37 @@ SCSI_Out_Bits_Sync_ctrl_reg__6__MASK EQU 0x40 SCSI_Out_Bits_Sync_ctrl_reg__6__POS EQU 6 SCSI_Out_Bits_Sync_ctrl_reg__7__MASK EQU 0x80 SCSI_Out_Bits_Sync_ctrl_reg__7__POS EQU 7 -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB07_CTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB07_ST_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB07_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB07_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB02_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB02_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB02_ST_CTL SCSI_Out_Bits_Sync_ctrl_reg__MASK EQU 0xFF -SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB07_MSK +SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB02_MSK /* SCSI_Out_Ctl */ SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB04_05_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB04_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB04_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB04_ST_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB04_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB04_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB01_02_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB01_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB01_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB01_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB01_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB01_ST_CTL SCSI_Out_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB04_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB01_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB01_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB01_MSK /* SCSI_Out_DBx */ SCSI_Out_DBx__0__AG EQU CYREG_PRT5_AG @@ -1911,6 +1971,7 @@ SCSI_Out_DBx__0__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__0__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__0__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__0__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_Out_DBx__0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__0__MASK EQU 0x02 @@ -1938,6 +1999,7 @@ SCSI_Out_DBx__1__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__1__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__1__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__1__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Out_DBx__1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__1__MASK EQU 0x01 @@ -1965,6 +2027,7 @@ SCSI_Out_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Out_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__2__MASK EQU 0x20 @@ -1992,6 +2055,7 @@ SCSI_Out_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Out_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__3__MASK EQU 0x10 @@ -2019,6 +2083,7 @@ SCSI_Out_DBx__4__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__4__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__4__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__4__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_Out_DBx__4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__4__MASK EQU 0x80 @@ -2046,6 +2111,7 @@ SCSI_Out_DBx__5__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__5__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__5__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__5__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_Out_DBx__5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__5__MASK EQU 0x40 @@ -2073,6 +2139,7 @@ SCSI_Out_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__6__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_Out_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__6__MASK EQU 0x08 @@ -2100,6 +2167,7 @@ SCSI_Out_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__7__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_Out_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__7__MASK EQU 0x04 @@ -2127,6 +2195,7 @@ SCSI_Out_DBx__DB0__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__DB0__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__DB0__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__DB0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__DB0__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_Out_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__DB0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__DB0__MASK EQU 0x02 @@ -2154,6 +2223,7 @@ SCSI_Out_DBx__DB1__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__DB1__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__DB1__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__DB1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__DB1__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Out_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__DB1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__DB1__MASK EQU 0x01 @@ -2181,6 +2251,7 @@ SCSI_Out_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Out_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB2__MASK EQU 0x20 @@ -2208,6 +2279,7 @@ SCSI_Out_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Out_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB3__MASK EQU 0x10 @@ -2235,6 +2307,7 @@ SCSI_Out_DBx__DB4__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB4__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB4__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB4__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_Out_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB4__MASK EQU 0x80 @@ -2262,6 +2335,7 @@ SCSI_Out_DBx__DB5__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB5__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB5__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB5__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_Out_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB5__MASK EQU 0x40 @@ -2289,6 +2363,7 @@ SCSI_Out_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_Out_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB6__MASK EQU 0x08 @@ -2316,6 +2391,7 @@ SCSI_Out_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_Out_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB7__MASK EQU 0x04 @@ -2389,6 +2465,7 @@ SCSI_Noise__0__DM1 EQU CYREG_PRT2_DM1 SCSI_Noise__0__DM2 EQU CYREG_PRT2_DM2 SCSI_Noise__0__DR EQU CYREG_PRT2_DR SCSI_Noise__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Noise__0__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_Noise__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Noise__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Noise__0__MASK EQU 0x01 @@ -2416,6 +2493,7 @@ SCSI_Noise__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__1__DR EQU CYREG_PRT6_DR SCSI_Noise__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__1__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Noise__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__1__MASK EQU 0x08 @@ -2443,6 +2521,7 @@ SCSI_Noise__2__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__2__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__2__DR EQU CYREG_PRT4_DR SCSI_Noise__2__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__2__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Noise__2__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__2__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__2__MASK EQU 0x08 @@ -2470,6 +2549,7 @@ SCSI_Noise__3__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__3__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__3__DR EQU CYREG_PRT4_DR SCSI_Noise__3__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__3__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Noise__3__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__3__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__3__MASK EQU 0x80 @@ -2497,6 +2577,7 @@ SCSI_Noise__4__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__4__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__4__DR EQU CYREG_PRT6_DR SCSI_Noise__4__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__4__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Noise__4__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__4__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__4__MASK EQU 0x04 @@ -2524,6 +2605,7 @@ SCSI_Noise__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__ACK__DR EQU CYREG_PRT6_DR SCSI_Noise__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Noise__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__ACK__MASK EQU 0x04 @@ -2551,6 +2633,7 @@ SCSI_Noise__ATN__DM1 EQU CYREG_PRT2_DM1 SCSI_Noise__ATN__DM2 EQU CYREG_PRT2_DM2 SCSI_Noise__ATN__DR EQU CYREG_PRT2_DR SCSI_Noise__ATN__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Noise__ATN__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_Noise__ATN__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Noise__ATN__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Noise__ATN__MASK EQU 0x01 @@ -2578,6 +2661,7 @@ SCSI_Noise__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__BSY__DR EQU CYREG_PRT6_DR SCSI_Noise__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Noise__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__BSY__MASK EQU 0x08 @@ -2605,6 +2689,7 @@ SCSI_Noise__RST__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__RST__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__RST__DR EQU CYREG_PRT4_DR SCSI_Noise__RST__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__RST__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Noise__RST__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__RST__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__RST__MASK EQU 0x80 @@ -2632,6 +2717,7 @@ SCSI_Noise__SEL__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__SEL__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__SEL__DR EQU CYREG_PRT4_DR SCSI_Noise__SEL__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__SEL__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Noise__SEL__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__SEL__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__SEL__MASK EQU 0x08 @@ -2699,8 +2785,8 @@ scsiTarget_StatusReg__0__MASK EQU 0x01 scsiTarget_StatusReg__0__POS EQU 0 scsiTarget_StatusReg__1__MASK EQU 0x02 scsiTarget_StatusReg__1__POS EQU 1 -scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL -scsiTarget_StatusReg__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST +scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB03_04_ACTL +scsiTarget_StatusReg__16BIT_STATUS_REG EQU CYREG_B0_UDB03_04_ST scsiTarget_StatusReg__2__MASK EQU 0x04 scsiTarget_StatusReg__2__POS EQU 2 scsiTarget_StatusReg__3__MASK EQU 0x08 @@ -2708,9 +2794,9 @@ scsiTarget_StatusReg__3__POS EQU 3 scsiTarget_StatusReg__4__MASK EQU 0x10 scsiTarget_StatusReg__4__POS EQU 4 scsiTarget_StatusReg__MASK EQU 0x1F -scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB07_MSK -scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL -scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB07_ST +scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB03_MSK +scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB03_ACTL +scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB03_ST /* Debug_Timer_Interrupt */ Debug_Timer_Interrupt__INTC_CLR_EN_REG EQU CYREG_NVIC_CLRENA0 @@ -2831,8 +2917,8 @@ SCSI_Filtered_sts_sts_reg__0__MASK EQU 0x01 SCSI_Filtered_sts_sts_reg__0__POS EQU 0 SCSI_Filtered_sts_sts_reg__1__MASK EQU 0x02 SCSI_Filtered_sts_sts_reg__1__POS EQU 1 -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB02_03_ST SCSI_Filtered_sts_sts_reg__2__MASK EQU 0x04 SCSI_Filtered_sts_sts_reg__2__POS EQU 2 SCSI_Filtered_sts_sts_reg__3__MASK EQU 0x08 @@ -2840,77 +2926,81 @@ SCSI_Filtered_sts_sts_reg__3__POS EQU 3 SCSI_Filtered_sts_sts_reg__4__MASK EQU 0x10 SCSI_Filtered_sts_sts_reg__4__POS EQU 4 SCSI_Filtered_sts_sts_reg__MASK EQU 0x1F -SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK -SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST +SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB02_MSK +SCSI_Filtered_sts_sts_reg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Filtered_sts_sts_reg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_CNT_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Filtered_sts_sts_reg__STATUS_CONTROL_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB02_ST /* SCSI_CTL_PHASE */ SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS EQU 0 SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS EQU 1 -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_06_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS EQU 2 -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB05_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB05_ST_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB05_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB05_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB12_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB12_ST_CTL SCSI_CTL_PHASE_Sync_ctrl_reg__MASK EQU 0x07 -SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB05_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB12_MSK /* SCSI_Glitch_Ctl */ SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB06_07_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB06_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB06_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB06_ST_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB06_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB06_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB13_14_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB13_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB13_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB13_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB13_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB13_ST_CTL SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB06_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB06_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB06_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB13_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB13_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB13_MSK /* SCSI_Parity_Error */ SCSI_Parity_Error_sts_sts_reg__0__MASK EQU 0x01 SCSI_Parity_Error_sts_sts_reg__0__POS EQU 0 -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB10_11_ST +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST SCSI_Parity_Error_sts_sts_reg__MASK EQU 0x01 -SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB10_MSK -SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB10_ST +SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK +SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL +SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST /* Miscellaneous */ BCLK__BUS_CLK__HZ EQU 50000000 BCLK__BUS_CLK__KHZ EQU 50000 BCLK__BUS_CLK__MHZ EQU 50 -CYDEV_CHIP_DIE_GEN4 EQU 2 CYDEV_CHIP_DIE_LEOPARD EQU 1 -CYDEV_CHIP_DIE_PANTHER EQU 12 -CYDEV_CHIP_DIE_PSOC4A EQU 5 -CYDEV_CHIP_DIE_PSOC5LP EQU 11 +CYDEV_CHIP_DIE_PANTHER EQU 18 +CYDEV_CHIP_DIE_PSOC4A EQU 10 +CYDEV_CHIP_DIE_PSOC5LP EQU 17 +CYDEV_CHIP_DIE_TMA4 EQU 2 CYDEV_CHIP_DIE_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_PSOC3 EQU 1 CYDEV_CHIP_FAMILY_PSOC4 EQU 2 @@ -2919,23 +3009,26 @@ CYDEV_CHIP_FAMILY_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_USED EQU CYDEV_CHIP_FAMILY_PSOC5 CYDEV_CHIP_JTAG_ID EQU 0x2E133069 CYDEV_CHIP_MEMBER_3A EQU 1 -CYDEV_CHIP_MEMBER_4A EQU 5 -CYDEV_CHIP_MEMBER_4C EQU 9 -CYDEV_CHIP_MEMBER_4D EQU 3 +CYDEV_CHIP_MEMBER_4A EQU 10 +CYDEV_CHIP_MEMBER_4C EQU 15 +CYDEV_CHIP_MEMBER_4D EQU 6 CYDEV_CHIP_MEMBER_4E EQU 4 -CYDEV_CHIP_MEMBER_4F EQU 6 +CYDEV_CHIP_MEMBER_4F EQU 11 CYDEV_CHIP_MEMBER_4G EQU 2 -CYDEV_CHIP_MEMBER_4L EQU 8 -CYDEV_CHIP_MEMBER_4M EQU 7 -CYDEV_CHIP_MEMBER_5A EQU 11 -CYDEV_CHIP_MEMBER_5B EQU 10 +CYDEV_CHIP_MEMBER_4H EQU 9 +CYDEV_CHIP_MEMBER_4I EQU 14 +CYDEV_CHIP_MEMBER_4J EQU 7 +CYDEV_CHIP_MEMBER_4K EQU 8 +CYDEV_CHIP_MEMBER_4L EQU 13 +CYDEV_CHIP_MEMBER_4M EQU 12 +CYDEV_CHIP_MEMBER_4N EQU 5 +CYDEV_CHIP_MEMBER_4U EQU 3 +CYDEV_CHIP_MEMBER_5A EQU 17 +CYDEV_CHIP_MEMBER_5B EQU 16 CYDEV_CHIP_MEMBER_UNKNOWN EQU 0 CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_DIE_ACTUAL EQU CYDEV_CHIP_DIE_EXPECT -CYDEV_CHIP_REV_GEN4_ES EQU 17 -CYDEV_CHIP_REV_GEN4_ES2 EQU 33 -CYDEV_CHIP_REV_GEN4_PRODUCTION EQU 17 CYDEV_CHIP_REV_LEOPARD_ES1 EQU 0 CYDEV_CHIP_REV_LEOPARD_ES2 EQU 1 CYDEV_CHIP_REV_LEOPARD_ES3 EQU 3 @@ -2947,6 +3040,9 @@ CYDEV_CHIP_REV_PSOC4A_ES0 EQU 17 CYDEV_CHIP_REV_PSOC4A_PRODUCTION EQU 17 CYDEV_CHIP_REV_PSOC5LP_ES0 EQU 0 CYDEV_CHIP_REV_PSOC5LP_PRODUCTION EQU 0 +CYDEV_CHIP_REV_TMA4_ES EQU 17 +CYDEV_CHIP_REV_TMA4_ES2 EQU 33 +CYDEV_CHIP_REV_TMA4_PRODUCTION EQU 17 CYDEV_CHIP_REVISION_3A_ES1 EQU 0 CYDEV_CHIP_REVISION_3A_ES2 EQU 1 CYDEV_CHIP_REVISION_3A_ES3 EQU 3 @@ -2957,12 +3053,19 @@ CYDEV_CHIP_REVISION_4C_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4D_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4E_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION_256K EQU 0 CYDEV_CHIP_REVISION_4G_ES EQU 17 CYDEV_CHIP_REVISION_4G_ES2 EQU 33 CYDEV_CHIP_REVISION_4G_PRODUCTION EQU 17 +CYDEV_CHIP_REVISION_4H_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4I_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4J_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4K_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4L_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4N_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4U_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_5A_ES0 EQU 0 CYDEV_CHIP_REVISION_5A_ES1 EQU 1 CYDEV_CHIP_REVISION_5A_PRODUCTION EQU 1 @@ -2995,6 +3098,8 @@ CYDEV_ECC_ENABLE EQU 0 CYDEV_HEAP_SIZE EQU 0x0400 CYDEV_INSTRUCT_CACHE_ENABLED EQU 1 CYDEV_INTR_RISING EQU 0x0000007E +CYDEV_IS_EXPORTING_CODE EQU 0 +CYDEV_IS_IMPORTING_CODE EQU 0 CYDEV_PROJ_TYPE EQU 2 CYDEV_PROJ_TYPE_BOOTLOADER EQU 1 CYDEV_PROJ_TYPE_LAUNCHER EQU 5 @@ -3007,14 +3112,22 @@ CYDEV_STACK_SIZE EQU 0x1000 CYDEV_USB_CLK_OSC_LOCKING_ENABLED_AT_PWR_UP EQU 1 CYDEV_USE_BUNDLED_CMSIS EQU 1 CYDEV_VARIABLE_VDDA EQU 0 +CYDEV_VDDA EQU 5 CYDEV_VDDA_MV EQU 5000 +CYDEV_VDDD EQU 5 CYDEV_VDDD_MV EQU 5000 +CYDEV_VDDIO0 EQU 5 CYDEV_VDDIO0_MV EQU 5000 +CYDEV_VDDIO1 EQU 5 CYDEV_VDDIO1_MV EQU 5000 +CYDEV_VDDIO2 EQU 5 CYDEV_VDDIO2_MV EQU 5000 CYDEV_VDDIO3_MV EQU 3300 +CYDEV_VIO0 EQU 5 CYDEV_VIO0_MV EQU 5000 +CYDEV_VIO1 EQU 5 CYDEV_VIO1_MV EQU 5000 +CYDEV_VIO2 EQU 5 CYDEV_VIO2_MV EQU 5000 CYDEV_VIO3_MV EQU 3300 CYIPBLOCK_ARM_CM3_VERSION EQU 0 diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc index 41094ea8..98aa6969 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc @@ -4,6 +4,7 @@ INCLUDED_CYFITTERRV_INC EQU 1 GET cydevicerv_trm.inc ; LED1 +LED1__0__INTTYPE EQU CYREG_PICU0_INTTYPE1 LED1__0__MASK EQU 0x02 LED1__0__PC EQU CYREG_PRT0_PC1 LED1__0__PORT EQU 0 @@ -19,6 +20,7 @@ LED1__DM1 EQU CYREG_PRT0_DM1 LED1__DM2 EQU CYREG_PRT0_DM2 LED1__DR EQU CYREG_PRT0_DR LED1__INP_DIS EQU CYREG_PRT0_INP_DIS +LED1__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU0_BASE LED1__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG LED1__LCD_EN EQU CYREG_PRT0_LCD_EN LED1__MASK EQU 0x02 @@ -36,6 +38,7 @@ LED1__SHIFT EQU 1 LED1__SLW EQU CYREG_PRT0_SLW ; SD_CD +SD_CD__0__INTTYPE EQU CYREG_PICU3_INTTYPE5 SD_CD__0__MASK EQU 0x20 SD_CD__0__PC EQU CYREG_PRT3_PC5 SD_CD__0__PORT EQU 3 @@ -51,6 +54,7 @@ SD_CD__DM1 EQU CYREG_PRT3_DM1 SD_CD__DM2 EQU CYREG_PRT3_DM2 SD_CD__DR EQU CYREG_PRT3_DR SD_CD__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CD__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CD__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CD__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CD__MASK EQU 0x20 @@ -68,6 +72,7 @@ SD_CD__SHIFT EQU 5 SD_CD__SLW EQU CYREG_PRT3_SLW ; SD_CS +SD_CS__0__INTTYPE EQU CYREG_PICU3_INTTYPE4 SD_CS__0__MASK EQU 0x10 SD_CS__0__PC EQU CYREG_PRT3_PC4 SD_CS__0__PORT EQU 3 @@ -83,6 +88,7 @@ SD_CS__DM1 EQU CYREG_PRT3_DM1 SD_CS__DM2 EQU CYREG_PRT3_DM2 SD_CS__DR EQU CYREG_PRT3_DR SD_CS__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_CS__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_CS__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_CS__LCD_EN EQU CYREG_PRT3_LCD_EN SD_CS__MASK EQU 0x10 @@ -120,6 +126,7 @@ USBFS_bus_reset__INTC_SET_EN_REG EQU CYREG_NVIC_SETENA0 USBFS_bus_reset__INTC_SET_PD_REG EQU CYREG_NVIC_SETPEND0 ; USBFS_Dm +USBFS_Dm__0__INTTYPE EQU CYREG_PICU15_INTTYPE7 USBFS_Dm__0__MASK EQU 0x80 USBFS_Dm__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC1 USBFS_Dm__0__PORT EQU 15 @@ -135,6 +142,7 @@ USBFS_Dm__DM1 EQU CYREG_PRT15_DM1 USBFS_Dm__DM2 EQU CYREG_PRT15_DM2 USBFS_Dm__DR EQU CYREG_PRT15_DR USBFS_Dm__INP_DIS EQU CYREG_PRT15_INP_DIS +USBFS_Dm__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dm__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dm__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dm__MASK EQU 0x80 @@ -152,6 +160,7 @@ USBFS_Dm__SHIFT EQU 7 USBFS_Dm__SLW EQU CYREG_PRT15_SLW ; USBFS_Dp +USBFS_Dp__0__INTTYPE EQU CYREG_PICU15_INTTYPE6 USBFS_Dp__0__MASK EQU 0x40 USBFS_Dp__0__PC EQU CYREG_IO_PC_PRT15_7_6_PC0 USBFS_Dp__0__PORT EQU 15 @@ -168,6 +177,7 @@ USBFS_Dp__DM2 EQU CYREG_PRT15_DM2 USBFS_Dp__DR EQU CYREG_PRT15_DR USBFS_Dp__INP_DIS EQU CYREG_PRT15_INP_DIS USBFS_Dp__INTSTAT EQU CYREG_PICU15_INTSTAT +USBFS_Dp__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU15_BASE USBFS_Dp__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG USBFS_Dp__LCD_EN EQU CYREG_PRT15_LCD_EN USBFS_Dp__MASK EQU 0x40 @@ -382,6 +392,7 @@ USBFS_USB__USBIO_CR0 EQU CYREG_USB_USBIO_CR0 USBFS_USB__USBIO_CR1 EQU CYREG_USB_USBIO_CR1 ; EXTLED +EXTLED__0__INTTYPE EQU CYREG_PICU0_INTTYPE0 EXTLED__0__MASK EQU 0x01 EXTLED__0__PC EQU CYREG_PRT0_PC0 EXTLED__0__PORT EQU 0 @@ -397,6 +408,7 @@ EXTLED__DM1 EQU CYREG_PRT0_DM1 EXTLED__DM2 EQU CYREG_PRT0_DM2 EXTLED__DR EQU CYREG_PRT0_DR EXTLED__INP_DIS EQU CYREG_PRT0_INP_DIS +EXTLED__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU0_BASE EXTLED__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG EXTLED__LCD_EN EQU CYREG_PRT0_LCD_EN EXTLED__MASK EQU 0x01 @@ -414,34 +426,34 @@ EXTLED__SHIFT EQU 0 EXTLED__SLW EQU CYREG_PRT0_SLW ; SDCard_BSPIM -SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB12_13_CTL -SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK -SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL -SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B0_UDB12_CTL -SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B0_UDB12_CTL -SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B0_UDB12_MSK -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL -SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B0_UDB12_13_ST -SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B0_UDB12_MSK -SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL -SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B0_UDB12_ST_CTL -SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B0_UDB12_ST -SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_08_ACTL -SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B1_UDB07_08_ST +SDCard_BSPIM_BitCounter__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB06_07_CTL +SDCard_BSPIM_BitCounter__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB06_07_MSK +SDCard_BSPIM_BitCounter__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL +SDCard_BSPIM_BitCounter__CONTROL_REG EQU CYREG_B1_UDB06_CTL +SDCard_BSPIM_BitCounter__CONTROL_ST_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter__COUNT_REG EQU CYREG_B1_UDB06_CTL +SDCard_BSPIM_BitCounter__COUNT_ST_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter__PERIOD_REG EQU CYREG_B1_UDB06_MSK +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_07_ACTL +SDCard_BSPIM_BitCounter_ST__16BIT_STATUS_REG EQU CYREG_B1_UDB06_07_ST +SDCard_BSPIM_BitCounter_ST__MASK_REG EQU CYREG_B1_UDB06_MSK +SDCard_BSPIM_BitCounter_ST__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB06_MSK_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB06_ACTL +SDCard_BSPIM_BitCounter_ST__STATUS_CNT_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_CONTROL_REG EQU CYREG_B1_UDB06_ST_CTL +SDCard_BSPIM_BitCounter_ST__STATUS_REG EQU CYREG_B1_UDB06_ST +SDCard_BSPIM_RxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL +SDCard_BSPIM_RxStsReg__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST SDCard_BSPIM_RxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_RxStsReg__4__POS EQU 4 SDCard_BSPIM_RxStsReg__5__MASK EQU 0x20 @@ -449,13 +461,9 @@ SDCard_BSPIM_RxStsReg__5__POS EQU 5 SDCard_BSPIM_RxStsReg__6__MASK EQU 0x40 SDCard_BSPIM_RxStsReg__6__POS EQU 6 SDCard_BSPIM_RxStsReg__MASK EQU 0x70 -SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B1_UDB07_MSK -SDCard_BSPIM_RxStsReg__MASK_ST_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SDCard_BSPIM_RxStsReg__PER_ST_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL -SDCard_BSPIM_RxStsReg__STATUS_CNT_REG EQU CYREG_B1_UDB07_ST_CTL -SDCard_BSPIM_RxStsReg__STATUS_CONTROL_REG EQU CYREG_B1_UDB07_ST_CTL -SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B1_UDB07_ST +SDCard_BSPIM_RxStsReg__MASK_REG EQU CYREG_B0_UDB07_MSK +SDCard_BSPIM_RxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL +SDCard_BSPIM_RxStsReg__STATUS_REG EQU CYREG_B0_UDB07_ST SDCard_BSPIM_sR8_Dp_u0__16BIT_A0_REG EQU CYREG_B1_UDB04_05_A0 SDCard_BSPIM_sR8_Dp_u0__16BIT_A1_REG EQU CYREG_B1_UDB04_05_A1 SDCard_BSPIM_sR8_Dp_u0__16BIT_D0_REG EQU CYREG_B1_UDB04_05_D0 @@ -473,12 +481,12 @@ SDCard_BSPIM_sR8_Dp_u0__DP_AUX_CTL_REG EQU CYREG_B1_UDB04_ACTL SDCard_BSPIM_sR8_Dp_u0__F0_F1_REG EQU CYREG_B1_UDB04_F0_F1 SDCard_BSPIM_sR8_Dp_u0__F0_REG EQU CYREG_B1_UDB04_F0 SDCard_BSPIM_sR8_Dp_u0__F1_REG EQU CYREG_B1_UDB04_F1 -SDCard_BSPIM_sR8_Dp_u0__MSK_DP_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SDCard_BSPIM_sR8_Dp_u0__PER_DP_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL SDCard_BSPIM_TxStsReg__0__MASK EQU 0x01 SDCard_BSPIM_TxStsReg__0__POS EQU 0 SDCard_BSPIM_TxStsReg__1__MASK EQU 0x02 SDCard_BSPIM_TxStsReg__1__POS EQU 1 +SDCard_BSPIM_TxStsReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_05_ACTL +SDCard_BSPIM_TxStsReg__16BIT_STATUS_REG EQU CYREG_B0_UDB04_05_ST SDCard_BSPIM_TxStsReg__2__MASK EQU 0x04 SDCard_BSPIM_TxStsReg__2__POS EQU 2 SDCard_BSPIM_TxStsReg__3__MASK EQU 0x08 @@ -486,11 +494,12 @@ SDCard_BSPIM_TxStsReg__3__POS EQU 3 SDCard_BSPIM_TxStsReg__4__MASK EQU 0x10 SDCard_BSPIM_TxStsReg__4__POS EQU 4 SDCard_BSPIM_TxStsReg__MASK EQU 0x1F -SDCard_BSPIM_TxStsReg__MASK_REG EQU CYREG_B1_UDB11_MSK -SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B1_UDB11_ACTL -SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B1_UDB11_ST +SDCard_BSPIM_TxStsReg__MASK_REG EQU CYREG_B0_UDB04_MSK +SDCard_BSPIM_TxStsReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB04_ACTL +SDCard_BSPIM_TxStsReg__STATUS_REG EQU CYREG_B0_UDB04_ST ; SD_SCK +SD_SCK__0__INTTYPE EQU CYREG_PICU3_INTTYPE2 SD_SCK__0__MASK EQU 0x04 SD_SCK__0__PC EQU CYREG_PRT3_PC2 SD_SCK__0__PORT EQU 3 @@ -506,6 +515,7 @@ SD_SCK__DM1 EQU CYREG_PRT3_DM1 SD_SCK__DM2 EQU CYREG_PRT3_DM2 SD_SCK__DR EQU CYREG_PRT3_DR SD_SCK__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_SCK__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_SCK__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_SCK__LCD_EN EQU CYREG_PRT3_LCD_EN SD_SCK__MASK EQU 0x04 @@ -534,6 +544,7 @@ SCSI_In__0__DM1 EQU CYREG_PRT2_DM1 SCSI_In__0__DM2 EQU CYREG_PRT2_DM2 SCSI_In__0__DR EQU CYREG_PRT2_DR SCSI_In__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__0__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__0__MASK EQU 0x02 @@ -561,6 +572,7 @@ SCSI_In__1__DM1 EQU CYREG_PRT4_DM1 SCSI_In__1__DM2 EQU CYREG_PRT4_DM2 SCSI_In__1__DR EQU CYREG_PRT4_DR SCSI_In__1__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__1__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_In__1__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__1__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__1__MASK EQU 0x40 @@ -588,6 +600,7 @@ SCSI_In__2__DM1 EQU CYREG_PRT4_DM1 SCSI_In__2__DM2 EQU CYREG_PRT4_DM2 SCSI_In__2__DR EQU CYREG_PRT4_DR SCSI_In__2__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__2__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_In__2__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__2__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__2__MASK EQU 0x04 @@ -615,6 +628,7 @@ SCSI_In__3__DM1 EQU CYREG_PRT0_DM1 SCSI_In__3__DM2 EQU CYREG_PRT0_DM2 SCSI_In__3__DR EQU CYREG_PRT0_DR SCSI_In__3__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__3__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_In__3__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__3__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__3__MASK EQU 0x20 @@ -642,6 +656,7 @@ SCSI_In__4__DM1 EQU CYREG_PRT0_DM1 SCSI_In__4__DM2 EQU CYREG_PRT0_DM2 SCSI_In__4__DR EQU CYREG_PRT0_DR SCSI_In__4__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__4__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_In__4__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__4__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__4__MASK EQU 0x10 @@ -669,6 +684,7 @@ SCSI_In__CD__DM1 EQU CYREG_PRT4_DM1 SCSI_In__CD__DM2 EQU CYREG_PRT4_DM2 SCSI_In__CD__DR EQU CYREG_PRT4_DR SCSI_In__CD__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__CD__INTTYPE EQU CYREG_PICU4_INTTYPE2 SCSI_In__CD__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__CD__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__CD__MASK EQU 0x04 @@ -696,6 +712,7 @@ SCSI_In__DBP__DM1 EQU CYREG_PRT2_DM1 SCSI_In__DBP__DM2 EQU CYREG_PRT2_DM2 SCSI_In__DBP__DR EQU CYREG_PRT2_DR SCSI_In__DBP__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In__DBP__INTTYPE EQU CYREG_PICU2_INTTYPE1 SCSI_In__DBP__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In__DBP__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In__DBP__MASK EQU 0x02 @@ -723,6 +740,7 @@ SCSI_In__IO__DM1 EQU CYREG_PRT0_DM1 SCSI_In__IO__DM2 EQU CYREG_PRT0_DM2 SCSI_In__IO__DR EQU CYREG_PRT0_DR SCSI_In__IO__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__IO__INTTYPE EQU CYREG_PICU0_INTTYPE4 SCSI_In__IO__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__IO__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__IO__MASK EQU 0x10 @@ -750,6 +768,7 @@ SCSI_In__MSG__DM1 EQU CYREG_PRT4_DM1 SCSI_In__MSG__DM2 EQU CYREG_PRT4_DM2 SCSI_In__MSG__DR EQU CYREG_PRT4_DR SCSI_In__MSG__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_In__MSG__INTTYPE EQU CYREG_PICU4_INTTYPE6 SCSI_In__MSG__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_In__MSG__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_In__MSG__MASK EQU 0x40 @@ -777,6 +796,7 @@ SCSI_In__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_In__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_In__REQ__DR EQU CYREG_PRT0_DR SCSI_In__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_In__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE5 SCSI_In__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_In__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_In__REQ__MASK EQU 0x20 @@ -806,6 +826,7 @@ SCSI_In_DBx__0__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__0__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__0__DR EQU CYREG_PRT5_DR SCSI_In_DBx__0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__0__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In_DBx__0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__0__MASK EQU 0x08 @@ -833,6 +854,7 @@ SCSI_In_DBx__1__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__1__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__1__DR EQU CYREG_PRT5_DR SCSI_In_DBx__1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__1__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In_DBx__1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__1__MASK EQU 0x04 @@ -860,6 +882,7 @@ SCSI_In_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__2__DR EQU CYREG_PRT6_DR SCSI_In_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__2__MASK EQU 0x80 @@ -887,6 +910,7 @@ SCSI_In_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__3__DR EQU CYREG_PRT6_DR SCSI_In_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_In_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__3__MASK EQU 0x40 @@ -912,6 +936,7 @@ SCSI_In_DBx__4__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__4__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__4__DR EQU CYREG_PRT12_DR SCSI_In_DBx__4__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__4__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_In_DBx__4__MASK EQU 0x20 SCSI_In_DBx__4__PC EQU CYREG_PRT12_PC5 SCSI_In_DBx__4__PORT EQU 12 @@ -938,6 +963,7 @@ SCSI_In_DBx__5__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__5__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__5__DR EQU CYREG_PRT12_DR SCSI_In_DBx__5__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__5__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__5__MASK EQU 0x10 SCSI_In_DBx__5__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__5__PORT EQU 12 @@ -966,6 +992,7 @@ SCSI_In_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__6__MASK EQU 0x20 @@ -993,6 +1020,7 @@ SCSI_In_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__7__MASK EQU 0x10 @@ -1020,6 +1048,7 @@ SCSI_In_DBx__DB0__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__DB0__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__DB0__DR EQU CYREG_PRT5_DR SCSI_In_DBx__DB0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__DB0__INTTYPE EQU CYREG_PICU5_INTTYPE3 SCSI_In_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__DB0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__DB0__MASK EQU 0x08 @@ -1047,6 +1076,7 @@ SCSI_In_DBx__DB1__DM1 EQU CYREG_PRT5_DM1 SCSI_In_DBx__DB1__DM2 EQU CYREG_PRT5_DM2 SCSI_In_DBx__DB1__DR EQU CYREG_PRT5_DR SCSI_In_DBx__DB1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_In_DBx__DB1__INTTYPE EQU CYREG_PICU5_INTTYPE2 SCSI_In_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_In_DBx__DB1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_In_DBx__DB1__MASK EQU 0x04 @@ -1074,6 +1104,7 @@ SCSI_In_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_In_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE7 SCSI_In_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__DB2__MASK EQU 0x80 @@ -1101,6 +1132,7 @@ SCSI_In_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_In_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_In_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_In_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_In_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE6 SCSI_In_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_In_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_In_DBx__DB3__MASK EQU 0x40 @@ -1126,6 +1158,7 @@ SCSI_In_DBx__DB4__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB4__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB4__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB4__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB4__INTTYPE EQU CYREG_PICU12_INTTYPE5 SCSI_In_DBx__DB4__MASK EQU 0x20 SCSI_In_DBx__DB4__PC EQU CYREG_PRT12_PC5 SCSI_In_DBx__DB4__PORT EQU 12 @@ -1152,6 +1185,7 @@ SCSI_In_DBx__DB5__DM1 EQU CYREG_PRT12_DM1 SCSI_In_DBx__DB5__DM2 EQU CYREG_PRT12_DM2 SCSI_In_DBx__DB5__DR EQU CYREG_PRT12_DR SCSI_In_DBx__DB5__INP_DIS EQU CYREG_PRT12_INP_DIS +SCSI_In_DBx__DB5__INTTYPE EQU CYREG_PICU12_INTTYPE4 SCSI_In_DBx__DB5__MASK EQU 0x10 SCSI_In_DBx__DB5__PC EQU CYREG_PRT12_PC4 SCSI_In_DBx__DB5__PORT EQU 12 @@ -1180,6 +1214,7 @@ SCSI_In_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE5 SCSI_In_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB6__MASK EQU 0x20 @@ -1207,6 +1242,7 @@ SCSI_In_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_In_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_In_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_In_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_In_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE4 SCSI_In_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_In_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_In_DBx__DB7__MASK EQU 0x10 @@ -1225,6 +1261,7 @@ SCSI_In_DBx__DB7__SHIFT EQU 4 SCSI_In_DBx__DB7__SLW EQU CYREG_PRT2_SLW ; SD_MISO +SD_MISO__0__INTTYPE EQU CYREG_PICU3_INTTYPE1 SD_MISO__0__MASK EQU 0x02 SD_MISO__0__PC EQU CYREG_PRT3_PC1 SD_MISO__0__PORT EQU 3 @@ -1240,6 +1277,7 @@ SD_MISO__DM1 EQU CYREG_PRT3_DM1 SD_MISO__DM2 EQU CYREG_PRT3_DM2 SD_MISO__DR EQU CYREG_PRT3_DR SD_MISO__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MISO__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MISO__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MISO__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MISO__MASK EQU 0x02 @@ -1257,6 +1295,7 @@ SD_MISO__SHIFT EQU 1 SD_MISO__SLW EQU CYREG_PRT3_SLW ; SD_MOSI +SD_MOSI__0__INTTYPE EQU CYREG_PICU3_INTTYPE3 SD_MOSI__0__MASK EQU 0x08 SD_MOSI__0__PC EQU CYREG_PRT3_PC3 SD_MOSI__0__PORT EQU 3 @@ -1272,6 +1311,7 @@ SD_MOSI__DM1 EQU CYREG_PRT3_DM1 SD_MOSI__DM2 EQU CYREG_PRT3_DM2 SD_MOSI__DR EQU CYREG_PRT3_DR SD_MOSI__INP_DIS EQU CYREG_PRT3_INP_DIS +SD_MOSI__INTTYPE_BASE EQU CYDEV_PICU_INTTYPE_PICU3_BASE SD_MOSI__LCD_COM_SEG EQU CYREG_PRT3_LCD_COM_SEG SD_MOSI__LCD_EN EQU CYREG_PRT3_LCD_EN SD_MOSI__MASK EQU 0x08 @@ -1311,6 +1351,7 @@ SCSI_Out__0__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__0__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__0__DR EQU CYREG_PRT15_DR SCSI_Out__0__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__0__INTTYPE EQU CYREG_PICU15_INTTYPE5 SCSI_Out__0__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__0__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__0__MASK EQU 0x20 @@ -1338,6 +1379,7 @@ SCSI_Out__1__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__1__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__1__DR EQU CYREG_PRT15_DR SCSI_Out__1__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__1__INTTYPE EQU CYREG_PICU15_INTTYPE4 SCSI_Out__1__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__1__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__1__MASK EQU 0x10 @@ -1365,6 +1407,7 @@ SCSI_Out__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__2__DR EQU CYREG_PRT6_DR SCSI_Out__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__2__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__2__MASK EQU 0x02 @@ -1392,6 +1435,7 @@ SCSI_Out__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__3__DR EQU CYREG_PRT6_DR SCSI_Out__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__3__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__3__MASK EQU 0x01 @@ -1419,6 +1463,7 @@ SCSI_Out__4__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__4__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__4__DR EQU CYREG_PRT4_DR SCSI_Out__4__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__4__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out__4__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__4__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__4__MASK EQU 0x20 @@ -1446,6 +1491,7 @@ SCSI_Out__5__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__5__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__5__DR EQU CYREG_PRT4_DR SCSI_Out__5__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__5__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out__5__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__5__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__5__MASK EQU 0x10 @@ -1473,6 +1519,7 @@ SCSI_Out__6__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__6__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__6__DR EQU CYREG_PRT0_DR SCSI_Out__6__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__6__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__6__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__6__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__6__MASK EQU 0x80 @@ -1500,6 +1547,7 @@ SCSI_Out__7__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__7__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__7__DR EQU CYREG_PRT0_DR SCSI_Out__7__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__7__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__7__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__7__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__7__MASK EQU 0x40 @@ -1527,6 +1575,7 @@ SCSI_Out__8__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__8__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__8__DR EQU CYREG_PRT0_DR SCSI_Out__8__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__8__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__8__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__8__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__8__MASK EQU 0x08 @@ -1554,6 +1603,7 @@ SCSI_Out__9__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__9__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__9__DR EQU CYREG_PRT0_DR SCSI_Out__9__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__9__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__9__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__9__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__9__MASK EQU 0x04 @@ -1581,6 +1631,7 @@ SCSI_Out__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__ACK__DR EQU CYREG_PRT6_DR SCSI_Out__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE0 SCSI_Out__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__ACK__MASK EQU 0x01 @@ -1608,6 +1659,7 @@ SCSI_Out__ATN__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__ATN__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__ATN__DR EQU CYREG_PRT15_DR SCSI_Out__ATN__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__ATN__INTTYPE EQU CYREG_PICU15_INTTYPE4 SCSI_Out__ATN__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__ATN__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__ATN__MASK EQU 0x10 @@ -1635,6 +1687,7 @@ SCSI_Out__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Out__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Out__BSY__DR EQU CYREG_PRT6_DR SCSI_Out__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE1 SCSI_Out__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out__BSY__MASK EQU 0x02 @@ -1662,6 +1715,7 @@ SCSI_Out__CD_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__CD_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__CD_raw__DR EQU CYREG_PRT0_DR SCSI_Out__CD_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__CD_raw__INTTYPE EQU CYREG_PICU0_INTTYPE6 SCSI_Out__CD_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__CD_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__CD_raw__MASK EQU 0x40 @@ -1689,6 +1743,7 @@ SCSI_Out__DBP_raw__DM1 EQU CYREG_PRT15_DM1 SCSI_Out__DBP_raw__DM2 EQU CYREG_PRT15_DM2 SCSI_Out__DBP_raw__DR EQU CYREG_PRT15_DR SCSI_Out__DBP_raw__INP_DIS EQU CYREG_PRT15_INP_DIS +SCSI_Out__DBP_raw__INTTYPE EQU CYREG_PICU15_INTTYPE5 SCSI_Out__DBP_raw__LCD_COM_SEG EQU CYREG_PRT15_LCD_COM_SEG SCSI_Out__DBP_raw__LCD_EN EQU CYREG_PRT15_LCD_EN SCSI_Out__DBP_raw__MASK EQU 0x20 @@ -1716,6 +1771,7 @@ SCSI_Out__IO_raw__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__IO_raw__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__IO_raw__DR EQU CYREG_PRT0_DR SCSI_Out__IO_raw__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__IO_raw__INTTYPE EQU CYREG_PICU0_INTTYPE2 SCSI_Out__IO_raw__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__IO_raw__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__IO_raw__MASK EQU 0x04 @@ -1743,6 +1799,7 @@ SCSI_Out__MSG_raw__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__MSG_raw__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__MSG_raw__DR EQU CYREG_PRT4_DR SCSI_Out__MSG_raw__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__MSG_raw__INTTYPE EQU CYREG_PICU4_INTTYPE4 SCSI_Out__MSG_raw__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__MSG_raw__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__MSG_raw__MASK EQU 0x10 @@ -1770,6 +1827,7 @@ SCSI_Out__REQ__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__REQ__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__REQ__DR EQU CYREG_PRT0_DR SCSI_Out__REQ__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__REQ__INTTYPE EQU CYREG_PICU0_INTTYPE3 SCSI_Out__REQ__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__REQ__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__REQ__MASK EQU 0x08 @@ -1797,6 +1855,7 @@ SCSI_Out__RST__DM1 EQU CYREG_PRT4_DM1 SCSI_Out__RST__DM2 EQU CYREG_PRT4_DM2 SCSI_Out__RST__DR EQU CYREG_PRT4_DR SCSI_Out__RST__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Out__RST__INTTYPE EQU CYREG_PICU4_INTTYPE5 SCSI_Out__RST__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Out__RST__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Out__RST__MASK EQU 0x20 @@ -1824,6 +1883,7 @@ SCSI_Out__SEL__DM1 EQU CYREG_PRT0_DM1 SCSI_Out__SEL__DM2 EQU CYREG_PRT0_DM2 SCSI_Out__SEL__DR EQU CYREG_PRT0_DR SCSI_Out__SEL__INP_DIS EQU CYREG_PRT0_INP_DIS +SCSI_Out__SEL__INTTYPE EQU CYREG_PICU0_INTTYPE7 SCSI_Out__SEL__LCD_COM_SEG EQU CYREG_PRT0_LCD_COM_SEG SCSI_Out__SEL__LCD_EN EQU CYREG_PRT0_LCD_EN SCSI_Out__SEL__MASK EQU 0x80 @@ -1846,15 +1906,15 @@ SCSI_Out_Bits_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Bits_Sync_ctrl_reg__0__POS EQU 0 SCSI_Out_Bits_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_Out_Bits_Sync_ctrl_reg__1__POS EQU 1 -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB07_08_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB07_08_CTL -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB07_08_MSK -SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB07_08_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB02_03_CTL +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB02_03_MSK +SCSI_Out_Bits_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB02_03_MSK SCSI_Out_Bits_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_Out_Bits_Sync_ctrl_reg__2__POS EQU 2 SCSI_Out_Bits_Sync_ctrl_reg__3__MASK EQU 0x08 @@ -1867,37 +1927,37 @@ SCSI_Out_Bits_Sync_ctrl_reg__6__MASK EQU 0x40 SCSI_Out_Bits_Sync_ctrl_reg__6__POS EQU 6 SCSI_Out_Bits_Sync_ctrl_reg__7__MASK EQU 0x80 SCSI_Out_Bits_Sync_ctrl_reg__7__POS EQU 7 -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB07_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB07_CTL -SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB07_ST_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB07_CTL -SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB07_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB02_CTL +SCSI_Out_Bits_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB02_CTL +SCSI_Out_Bits_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB02_ST_CTL SCSI_Out_Bits_Sync_ctrl_reg__MASK EQU 0xFF -SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB07_MSK_ACTL -SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB07_MSK +SCSI_Out_Bits_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Out_Bits_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB02_MSK ; SCSI_Out_Ctl SCSI_Out_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Out_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB04_05_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B1_UDB04_05_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B1_UDB04_05_MSK -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B1_UDB04_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B1_UDB04_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B1_UDB04_ST_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B1_UDB04_CTL -SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B1_UDB04_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB01_02_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB01_02_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB01_02_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB01_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB01_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB01_ST_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB01_CTL +SCSI_Out_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB01_ST_CTL SCSI_Out_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B1_UDB04_MSK_ACTL -SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B1_UDB04_MSK +SCSI_Out_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB01_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB01_MSK_ACTL +SCSI_Out_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB01_MSK ; SCSI_Out_DBx SCSI_Out_DBx__0__AG EQU CYREG_PRT5_AG @@ -1911,6 +1971,7 @@ SCSI_Out_DBx__0__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__0__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__0__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__0__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_Out_DBx__0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__0__MASK EQU 0x02 @@ -1938,6 +1999,7 @@ SCSI_Out_DBx__1__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__1__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__1__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__1__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Out_DBx__1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__1__MASK EQU 0x01 @@ -1965,6 +2027,7 @@ SCSI_Out_DBx__2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__2__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Out_DBx__2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__2__MASK EQU 0x20 @@ -1992,6 +2055,7 @@ SCSI_Out_DBx__3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__3__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Out_DBx__3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__3__MASK EQU 0x10 @@ -2019,6 +2083,7 @@ SCSI_Out_DBx__4__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__4__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__4__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__4__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_Out_DBx__4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__4__MASK EQU 0x80 @@ -2046,6 +2111,7 @@ SCSI_Out_DBx__5__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__5__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__5__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__5__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_Out_DBx__5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__5__MASK EQU 0x40 @@ -2073,6 +2139,7 @@ SCSI_Out_DBx__6__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__6__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__6__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__6__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_Out_DBx__6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__6__MASK EQU 0x08 @@ -2100,6 +2167,7 @@ SCSI_Out_DBx__7__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__7__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__7__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__7__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_Out_DBx__7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__7__MASK EQU 0x04 @@ -2127,6 +2195,7 @@ SCSI_Out_DBx__DB0__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__DB0__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__DB0__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__DB0__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__DB0__INTTYPE EQU CYREG_PICU5_INTTYPE1 SCSI_Out_DBx__DB0__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__DB0__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__DB0__MASK EQU 0x02 @@ -2154,6 +2223,7 @@ SCSI_Out_DBx__DB1__DM1 EQU CYREG_PRT5_DM1 SCSI_Out_DBx__DB1__DM2 EQU CYREG_PRT5_DM2 SCSI_Out_DBx__DB1__DR EQU CYREG_PRT5_DR SCSI_Out_DBx__DB1__INP_DIS EQU CYREG_PRT5_INP_DIS +SCSI_Out_DBx__DB1__INTTYPE EQU CYREG_PICU5_INTTYPE0 SCSI_Out_DBx__DB1__LCD_COM_SEG EQU CYREG_PRT5_LCD_COM_SEG SCSI_Out_DBx__DB1__LCD_EN EQU CYREG_PRT5_LCD_EN SCSI_Out_DBx__DB1__MASK EQU 0x01 @@ -2181,6 +2251,7 @@ SCSI_Out_DBx__DB2__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB2__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB2__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB2__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB2__INTTYPE EQU CYREG_PICU6_INTTYPE5 SCSI_Out_DBx__DB2__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB2__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB2__MASK EQU 0x20 @@ -2208,6 +2279,7 @@ SCSI_Out_DBx__DB3__DM1 EQU CYREG_PRT6_DM1 SCSI_Out_DBx__DB3__DM2 EQU CYREG_PRT6_DM2 SCSI_Out_DBx__DB3__DR EQU CYREG_PRT6_DR SCSI_Out_DBx__DB3__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Out_DBx__DB3__INTTYPE EQU CYREG_PICU6_INTTYPE4 SCSI_Out_DBx__DB3__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Out_DBx__DB3__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Out_DBx__DB3__MASK EQU 0x10 @@ -2235,6 +2307,7 @@ SCSI_Out_DBx__DB4__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB4__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB4__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB4__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB4__INTTYPE EQU CYREG_PICU2_INTTYPE7 SCSI_Out_DBx__DB4__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB4__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB4__MASK EQU 0x80 @@ -2262,6 +2335,7 @@ SCSI_Out_DBx__DB5__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB5__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB5__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB5__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB5__INTTYPE EQU CYREG_PICU2_INTTYPE6 SCSI_Out_DBx__DB5__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB5__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB5__MASK EQU 0x40 @@ -2289,6 +2363,7 @@ SCSI_Out_DBx__DB6__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB6__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB6__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB6__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB6__INTTYPE EQU CYREG_PICU2_INTTYPE3 SCSI_Out_DBx__DB6__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB6__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB6__MASK EQU 0x08 @@ -2316,6 +2391,7 @@ SCSI_Out_DBx__DB7__DM1 EQU CYREG_PRT2_DM1 SCSI_Out_DBx__DB7__DM2 EQU CYREG_PRT2_DM2 SCSI_Out_DBx__DB7__DR EQU CYREG_PRT2_DR SCSI_Out_DBx__DB7__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Out_DBx__DB7__INTTYPE EQU CYREG_PICU2_INTTYPE2 SCSI_Out_DBx__DB7__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Out_DBx__DB7__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Out_DBx__DB7__MASK EQU 0x04 @@ -2389,6 +2465,7 @@ SCSI_Noise__0__DM1 EQU CYREG_PRT2_DM1 SCSI_Noise__0__DM2 EQU CYREG_PRT2_DM2 SCSI_Noise__0__DR EQU CYREG_PRT2_DR SCSI_Noise__0__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Noise__0__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_Noise__0__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Noise__0__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Noise__0__MASK EQU 0x01 @@ -2416,6 +2493,7 @@ SCSI_Noise__1__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__1__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__1__DR EQU CYREG_PRT6_DR SCSI_Noise__1__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__1__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Noise__1__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__1__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__1__MASK EQU 0x08 @@ -2443,6 +2521,7 @@ SCSI_Noise__2__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__2__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__2__DR EQU CYREG_PRT4_DR SCSI_Noise__2__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__2__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Noise__2__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__2__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__2__MASK EQU 0x08 @@ -2470,6 +2549,7 @@ SCSI_Noise__3__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__3__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__3__DR EQU CYREG_PRT4_DR SCSI_Noise__3__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__3__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Noise__3__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__3__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__3__MASK EQU 0x80 @@ -2497,6 +2577,7 @@ SCSI_Noise__4__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__4__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__4__DR EQU CYREG_PRT6_DR SCSI_Noise__4__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__4__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Noise__4__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__4__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__4__MASK EQU 0x04 @@ -2524,6 +2605,7 @@ SCSI_Noise__ACK__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__ACK__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__ACK__DR EQU CYREG_PRT6_DR SCSI_Noise__ACK__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__ACK__INTTYPE EQU CYREG_PICU6_INTTYPE2 SCSI_Noise__ACK__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__ACK__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__ACK__MASK EQU 0x04 @@ -2551,6 +2633,7 @@ SCSI_Noise__ATN__DM1 EQU CYREG_PRT2_DM1 SCSI_Noise__ATN__DM2 EQU CYREG_PRT2_DM2 SCSI_Noise__ATN__DR EQU CYREG_PRT2_DR SCSI_Noise__ATN__INP_DIS EQU CYREG_PRT2_INP_DIS +SCSI_Noise__ATN__INTTYPE EQU CYREG_PICU2_INTTYPE0 SCSI_Noise__ATN__LCD_COM_SEG EQU CYREG_PRT2_LCD_COM_SEG SCSI_Noise__ATN__LCD_EN EQU CYREG_PRT2_LCD_EN SCSI_Noise__ATN__MASK EQU 0x01 @@ -2578,6 +2661,7 @@ SCSI_Noise__BSY__DM1 EQU CYREG_PRT6_DM1 SCSI_Noise__BSY__DM2 EQU CYREG_PRT6_DM2 SCSI_Noise__BSY__DR EQU CYREG_PRT6_DR SCSI_Noise__BSY__INP_DIS EQU CYREG_PRT6_INP_DIS +SCSI_Noise__BSY__INTTYPE EQU CYREG_PICU6_INTTYPE3 SCSI_Noise__BSY__LCD_COM_SEG EQU CYREG_PRT6_LCD_COM_SEG SCSI_Noise__BSY__LCD_EN EQU CYREG_PRT6_LCD_EN SCSI_Noise__BSY__MASK EQU 0x08 @@ -2605,6 +2689,7 @@ SCSI_Noise__RST__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__RST__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__RST__DR EQU CYREG_PRT4_DR SCSI_Noise__RST__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__RST__INTTYPE EQU CYREG_PICU4_INTTYPE7 SCSI_Noise__RST__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__RST__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__RST__MASK EQU 0x80 @@ -2632,6 +2717,7 @@ SCSI_Noise__SEL__DM1 EQU CYREG_PRT4_DM1 SCSI_Noise__SEL__DM2 EQU CYREG_PRT4_DM2 SCSI_Noise__SEL__DR EQU CYREG_PRT4_DR SCSI_Noise__SEL__INP_DIS EQU CYREG_PRT4_INP_DIS +SCSI_Noise__SEL__INTTYPE EQU CYREG_PICU4_INTTYPE3 SCSI_Noise__SEL__LCD_COM_SEG EQU CYREG_PRT4_LCD_COM_SEG SCSI_Noise__SEL__LCD_EN EQU CYREG_PRT4_LCD_EN SCSI_Noise__SEL__MASK EQU 0x08 @@ -2699,8 +2785,8 @@ scsiTarget_StatusReg__0__MASK EQU 0x01 scsiTarget_StatusReg__0__POS EQU 0 scsiTarget_StatusReg__1__MASK EQU 0x02 scsiTarget_StatusReg__1__POS EQU 1 -scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_08_ACTL -scsiTarget_StatusReg__16BIT_STATUS_REG EQU CYREG_B0_UDB07_08_ST +scsiTarget_StatusReg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB03_04_ACTL +scsiTarget_StatusReg__16BIT_STATUS_REG EQU CYREG_B0_UDB03_04_ST scsiTarget_StatusReg__2__MASK EQU 0x04 scsiTarget_StatusReg__2__POS EQU 2 scsiTarget_StatusReg__3__MASK EQU 0x08 @@ -2708,9 +2794,9 @@ scsiTarget_StatusReg__3__POS EQU 3 scsiTarget_StatusReg__4__MASK EQU 0x10 scsiTarget_StatusReg__4__POS EQU 4 scsiTarget_StatusReg__MASK EQU 0x1F -scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB07_MSK -scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB07_ACTL -scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB07_ST +scsiTarget_StatusReg__MASK_REG EQU CYREG_B0_UDB03_MSK +scsiTarget_StatusReg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB03_ACTL +scsiTarget_StatusReg__STATUS_REG EQU CYREG_B0_UDB03_ST ; Debug_Timer_Interrupt Debug_Timer_Interrupt__INTC_CLR_EN_REG EQU CYREG_NVIC_CLRENA0 @@ -2831,8 +2917,8 @@ SCSI_Filtered_sts_sts_reg__0__MASK EQU 0x01 SCSI_Filtered_sts_sts_reg__0__POS EQU 0 SCSI_Filtered_sts_sts_reg__1__MASK EQU 0x02 SCSI_Filtered_sts_sts_reg__1__POS EQU 1 -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL -SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_03_ACTL +SCSI_Filtered_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB02_03_ST SCSI_Filtered_sts_sts_reg__2__MASK EQU 0x04 SCSI_Filtered_sts_sts_reg__2__POS EQU 2 SCSI_Filtered_sts_sts_reg__3__MASK EQU 0x08 @@ -2840,77 +2926,81 @@ SCSI_Filtered_sts_sts_reg__3__POS EQU 3 SCSI_Filtered_sts_sts_reg__4__MASK EQU 0x10 SCSI_Filtered_sts_sts_reg__4__POS EQU 4 SCSI_Filtered_sts_sts_reg__MASK EQU 0x1F -SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK -SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL -SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST +SCSI_Filtered_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB02_MSK +SCSI_Filtered_sts_sts_reg__MASK_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Filtered_sts_sts_reg__PER_ST_AUX_CTL_REG EQU CYREG_B0_UDB02_MSK_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB02_ACTL +SCSI_Filtered_sts_sts_reg__STATUS_CNT_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Filtered_sts_sts_reg__STATUS_CONTROL_REG EQU CYREG_B0_UDB02_ST_CTL +SCSI_Filtered_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB02_ST ; SCSI_CTL_PHASE SCSI_CTL_PHASE_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_CTL_PHASE_Sync_ctrl_reg__0__POS EQU 0 SCSI_CTL_PHASE_Sync_ctrl_reg__1__MASK EQU 0x02 SCSI_CTL_PHASE_Sync_ctrl_reg__1__POS EQU 1 -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_06_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB05_06_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB05_06_MSK -SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB05_06_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_13_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB12_13_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB12_13_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB12_13_MSK SCSI_CTL_PHASE_Sync_ctrl_reg__2__MASK EQU 0x04 SCSI_CTL_PHASE_Sync_ctrl_reg__2__POS EQU 2 -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB05_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB05_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB05_ST_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB05_CTL -SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB05_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB12_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB12_ST_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB12_CTL +SCSI_CTL_PHASE_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB12_ST_CTL SCSI_CTL_PHASE_Sync_ctrl_reg__MASK EQU 0x07 -SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB05_MSK_ACTL -SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB05_MSK +SCSI_CTL_PHASE_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB12_MSK_ACTL +SCSI_CTL_PHASE_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB12_MSK ; SCSI_Glitch_Ctl SCSI_Glitch_Ctl_Sync_ctrl_reg__0__MASK EQU 0x01 SCSI_Glitch_Ctl_Sync_ctrl_reg__0__POS EQU 0 -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB06_07_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB06_07_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB06_07_MSK -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB06_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB06_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB06_ST_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB06_CTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB06_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB13_14_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_CONTROL_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_CONTROL_COUNT_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_CONTROL_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_COUNT_COUNT_REG EQU CYREG_B0_UDB13_14_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_MASK_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_MASK_PERIOD_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_MASK_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__16BIT_PERIOD_PERIOD_REG EQU CYREG_B0_UDB13_14_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_AUX_CTL_REG EQU CYREG_B0_UDB13_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_REG EQU CYREG_B0_UDB13_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__CONTROL_ST_REG EQU CYREG_B0_UDB13_ST_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_REG EQU CYREG_B0_UDB13_CTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__COUNT_ST_REG EQU CYREG_B0_UDB13_ST_CTL SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK EQU 0x01 -SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB06_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB06_MSK_ACTL -SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB06_MSK +SCSI_Glitch_Ctl_Sync_ctrl_reg__MASK_CTL_AUX_CTL_REG EQU CYREG_B0_UDB13_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PER_CTL_AUX_CTL_REG EQU CYREG_B0_UDB13_MSK_ACTL +SCSI_Glitch_Ctl_Sync_ctrl_reg__PERIOD_REG EQU CYREG_B0_UDB13_MSK ; SCSI_Parity_Error SCSI_Parity_Error_sts_sts_reg__0__MASK EQU 0x01 SCSI_Parity_Error_sts_sts_reg__0__POS EQU 0 -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_11_ACTL -SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB10_11_ST +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_12_ACTL +SCSI_Parity_Error_sts_sts_reg__16BIT_STATUS_REG EQU CYREG_B0_UDB11_12_ST SCSI_Parity_Error_sts_sts_reg__MASK EQU 0x01 -SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB10_MSK -SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB10_ACTL -SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB10_ST +SCSI_Parity_Error_sts_sts_reg__MASK_REG EQU CYREG_B0_UDB11_MSK +SCSI_Parity_Error_sts_sts_reg__STATUS_AUX_CTL_REG EQU CYREG_B0_UDB11_ACTL +SCSI_Parity_Error_sts_sts_reg__STATUS_REG EQU CYREG_B0_UDB11_ST ; Miscellaneous BCLK__BUS_CLK__HZ EQU 50000000 BCLK__BUS_CLK__KHZ EQU 50000 BCLK__BUS_CLK__MHZ EQU 50 -CYDEV_CHIP_DIE_GEN4 EQU 2 CYDEV_CHIP_DIE_LEOPARD EQU 1 -CYDEV_CHIP_DIE_PANTHER EQU 12 -CYDEV_CHIP_DIE_PSOC4A EQU 5 -CYDEV_CHIP_DIE_PSOC5LP EQU 11 +CYDEV_CHIP_DIE_PANTHER EQU 18 +CYDEV_CHIP_DIE_PSOC4A EQU 10 +CYDEV_CHIP_DIE_PSOC5LP EQU 17 +CYDEV_CHIP_DIE_TMA4 EQU 2 CYDEV_CHIP_DIE_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_PSOC3 EQU 1 CYDEV_CHIP_FAMILY_PSOC4 EQU 2 @@ -2919,23 +3009,26 @@ CYDEV_CHIP_FAMILY_UNKNOWN EQU 0 CYDEV_CHIP_FAMILY_USED EQU CYDEV_CHIP_FAMILY_PSOC5 CYDEV_CHIP_JTAG_ID EQU 0x2E133069 CYDEV_CHIP_MEMBER_3A EQU 1 -CYDEV_CHIP_MEMBER_4A EQU 5 -CYDEV_CHIP_MEMBER_4C EQU 9 -CYDEV_CHIP_MEMBER_4D EQU 3 +CYDEV_CHIP_MEMBER_4A EQU 10 +CYDEV_CHIP_MEMBER_4C EQU 15 +CYDEV_CHIP_MEMBER_4D EQU 6 CYDEV_CHIP_MEMBER_4E EQU 4 -CYDEV_CHIP_MEMBER_4F EQU 6 +CYDEV_CHIP_MEMBER_4F EQU 11 CYDEV_CHIP_MEMBER_4G EQU 2 -CYDEV_CHIP_MEMBER_4L EQU 8 -CYDEV_CHIP_MEMBER_4M EQU 7 -CYDEV_CHIP_MEMBER_5A EQU 11 -CYDEV_CHIP_MEMBER_5B EQU 10 +CYDEV_CHIP_MEMBER_4H EQU 9 +CYDEV_CHIP_MEMBER_4I EQU 14 +CYDEV_CHIP_MEMBER_4J EQU 7 +CYDEV_CHIP_MEMBER_4K EQU 8 +CYDEV_CHIP_MEMBER_4L EQU 13 +CYDEV_CHIP_MEMBER_4M EQU 12 +CYDEV_CHIP_MEMBER_4N EQU 5 +CYDEV_CHIP_MEMBER_4U EQU 3 +CYDEV_CHIP_MEMBER_5A EQU 17 +CYDEV_CHIP_MEMBER_5B EQU 16 CYDEV_CHIP_MEMBER_UNKNOWN EQU 0 CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_DIE_ACTUAL EQU CYDEV_CHIP_DIE_EXPECT -CYDEV_CHIP_REV_GEN4_ES EQU 17 -CYDEV_CHIP_REV_GEN4_ES2 EQU 33 -CYDEV_CHIP_REV_GEN4_PRODUCTION EQU 17 CYDEV_CHIP_REV_LEOPARD_ES1 EQU 0 CYDEV_CHIP_REV_LEOPARD_ES2 EQU 1 CYDEV_CHIP_REV_LEOPARD_ES3 EQU 3 @@ -2947,6 +3040,9 @@ CYDEV_CHIP_REV_PSOC4A_ES0 EQU 17 CYDEV_CHIP_REV_PSOC4A_PRODUCTION EQU 17 CYDEV_CHIP_REV_PSOC5LP_ES0 EQU 0 CYDEV_CHIP_REV_PSOC5LP_PRODUCTION EQU 0 +CYDEV_CHIP_REV_TMA4_ES EQU 17 +CYDEV_CHIP_REV_TMA4_ES2 EQU 33 +CYDEV_CHIP_REV_TMA4_PRODUCTION EQU 17 CYDEV_CHIP_REVISION_3A_ES1 EQU 0 CYDEV_CHIP_REVISION_3A_ES2 EQU 1 CYDEV_CHIP_REVISION_3A_ES3 EQU 3 @@ -2957,12 +3053,19 @@ CYDEV_CHIP_REVISION_4C_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4D_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4E_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4F_PRODUCTION_256DMA EQU 0 CYDEV_CHIP_REVISION_4F_PRODUCTION_256K EQU 0 CYDEV_CHIP_REVISION_4G_ES EQU 17 CYDEV_CHIP_REVISION_4G_ES2 EQU 33 CYDEV_CHIP_REVISION_4G_PRODUCTION EQU 17 +CYDEV_CHIP_REVISION_4H_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4I_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4J_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4K_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4L_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4N_PRODUCTION EQU 0 +CYDEV_CHIP_REVISION_4U_PRODUCTION EQU 0 CYDEV_CHIP_REVISION_5A_ES0 EQU 0 CYDEV_CHIP_REVISION_5A_ES1 EQU 1 CYDEV_CHIP_REVISION_5A_PRODUCTION EQU 1 @@ -2995,6 +3098,8 @@ CYDEV_ECC_ENABLE EQU 0 CYDEV_HEAP_SIZE EQU 0x0400 CYDEV_INSTRUCT_CACHE_ENABLED EQU 1 CYDEV_INTR_RISING EQU 0x0000007E +CYDEV_IS_EXPORTING_CODE EQU 0 +CYDEV_IS_IMPORTING_CODE EQU 0 CYDEV_PROJ_TYPE EQU 2 CYDEV_PROJ_TYPE_BOOTLOADER EQU 1 CYDEV_PROJ_TYPE_LAUNCHER EQU 5 @@ -3007,14 +3112,22 @@ CYDEV_STACK_SIZE EQU 0x1000 CYDEV_USB_CLK_OSC_LOCKING_ENABLED_AT_PWR_UP EQU 1 CYDEV_USE_BUNDLED_CMSIS EQU 1 CYDEV_VARIABLE_VDDA EQU 0 +CYDEV_VDDA EQU 5 CYDEV_VDDA_MV EQU 5000 +CYDEV_VDDD EQU 5 CYDEV_VDDD_MV EQU 5000 +CYDEV_VDDIO0 EQU 5 CYDEV_VDDIO0_MV EQU 5000 +CYDEV_VDDIO1 EQU 5 CYDEV_VDDIO1_MV EQU 5000 +CYDEV_VDDIO2 EQU 5 CYDEV_VDDIO2_MV EQU 5000 CYDEV_VDDIO3_MV EQU 3300 +CYDEV_VIO0 EQU 5 CYDEV_VIO0_MV EQU 5000 +CYDEV_VIO1 EQU 5 CYDEV_VIO1_MV EQU 5000 +CYDEV_VIO2 EQU 5 CYDEV_VIO2_MV EQU 5000 CYDEV_VIO3_MV EQU 3300 CYIPBLOCK_ARM_CM3_VERSION EQU 0 diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c index bf9f0781..bae2d8f5 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cymetadata.c @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: cymetadata.c +* File Name: cymetadata.c * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * This file defines all extra memory spaces that need to be included. * This file is automatically generated by PSoC Creator. * @@ -28,7 +28,7 @@ __attribute__ ((__section__(".cyloadablemeta"), used)) const uint8 cy_meta_loadable[] = { 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, - 0x00u, 0x00u, 0x00u, 0x00u, 0x5Cu, 0xD1u, 0x41u, 0x04u, + 0x00u, 0x00u, 0x00u, 0x00u, 0x5Cu, 0xD1u, 0x50u, 0x04u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/exported_symbols.txt b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/exported_symbols.txt new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h index 1c6dbc32..907afd12 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h @@ -1,9 +1,9 @@ /******************************************************************************* -* FILENAME: project.h +* File Name: project.h * -* PSoC Creator 3.2 +* PSoC Creator 3.3 * -* DESCRIPTION: +* Description: * It contains references to all generated header files and should not be modified. * This file is automatically generated by PSoC Creator. * diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/renamed_symbols.txt b/software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/renamed_symbols.txt new file mode 100755 index 00000000..e69de29b diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx index 9eec602d..1828394a 100644 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx @@ -1,13 +1,13 @@ - - - - - - - - + \ No newline at end of file diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cydwr b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cydwr index ba6062d6..cab6858b 100755 Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cydwr and b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cydwr differ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit index cbd3c3ff..e6b8bee9 100644 Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit differ diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj index af5a6672..2ba239fc 100755 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj @@ -2420,6 +2420,24 @@ + + + + + + + + + + + + + + + + + + @@ -2547,6 +2565,8 @@ + + @@ -2579,6 +2599,8 @@ + + @@ -2611,6 +2633,8 @@ + + @@ -2643,6 +2667,8 @@ + + @@ -2679,6 +2705,8 @@ + + @@ -2711,6 +2739,8 @@ + + @@ -2743,6 +2773,8 @@ + + @@ -2775,6 +2807,8 @@ + + @@ -2914,8 +2948,8 @@ - - + + diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd index c17346a2..a5792d56 100644 --- a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd +++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd @@ -9,7 +9,7 @@ SCSI_Filtered No description available - 0x4000646B + 0x40006462 0 0x0 @@ -164,7 +164,7 @@ SCSI_Parity_Error No description available - 0x4000646A + 0x4000646B 0 0x0 @@ -319,7 +319,7 @@ SCSI_Glitch_Ctl No description available - 0x40006476 + 0x4000647D 0 0x0 @@ -340,7 +340,7 @@ SCSI_CTL_PHASE No description available - 0x40006475 + 0x4000647C 0 0x0 @@ -1137,7 +1137,7 @@ SCSI_Out_Ctl No description available - 0x40006574 + 0x40006471 0 0x0 @@ -1158,7 +1158,7 @@ SCSI_Out_Bits No description available - 0x40006577 + 0x40006472 0 0x0 diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch b/software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch index 282d8833..fdaa05f6 100755 Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch and b/software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch differ diff --git a/software/include/scsi2sd.h b/software/include/scsi2sd.h index 00df21a2..aa5a9340 100755 --- a/software/include/scsi2sd.h +++ b/software/include/scsi2sd.h @@ -45,7 +45,9 @@ extern "C" { | ... | |Row 188 | Config target 0 --------------------------------- - |Row 235 | + |Row 187 | Board Config + --------------------------------- + |Row 186 | | ... | |Row 0 | --------| | @@ -70,6 +72,7 @@ extern "C" { // 256 bytes data, 32 bytes ECC #define SCSI_CONFIG_ROW_SIZE 256 #define SCSI_CONFIG_ROW_ECC 288 +#define SCSI_CONFIG_BOARD_ROW 187 #define SCSI_CONFIG_0_ROW 188 #define SCSI_CONFIG_1_ROW 204 #define SCSI_CONFIG_2_ROW 220 @@ -86,7 +89,9 @@ typedef enum CONFIG_ENABLE_UNIT_ATTENTION = 1, CONFIG_ENABLE_PARITY = 2, CONFIG_ENABLE_SCSI2 = 4, - CONFIG_DISABLE_GLITCH = 8 + CONFIG_DISABLE_GLITCH = 8, + CONFIG_ENABLE_CACHE = 16, + CONFIG_ENABLE_DISCONNECT = 32 } CONFIG_FLAGS; typedef enum @@ -122,7 +127,7 @@ typedef struct __attribute__((packed)) uint8_t scsiId; uint8_t deviceType; // CONFIG_TYPE - uint8_t flags; // CONFIG_FLAGS + uint8_t flagsDEPRECATED; // CONFIG_FLAGS, removed in v4.5 uint8_t deviceTypeModifier; // Used in INQUIRY response. uint32_t sdSectorStart; @@ -149,6 +154,16 @@ typedef struct __attribute__((packed)) uint8_t vpd[3072]; // Total size is 4k. } TargetConfig; +typedef struct __attribute__((packed)) +{ + char magic[4]; // 'BCFG' + uint8_t flags; // CONFIG_FLAGS + uint8_t startupDelay; // Seconds. + uint8_t selectionDelay; // milliseconds. 255 = auto + + uint8_t reserved[249]; // Pad out to 256 bytes +} BoardConfig; + typedef enum { CONFIG_NONE, // Invalid diff --git a/software/scsi2sd-util/BoardPanel.cc b/software/scsi2sd-util/BoardPanel.cc new file mode 100644 index 00000000..fc69ae6c --- /dev/null +++ b/software/scsi2sd-util/BoardPanel.cc @@ -0,0 +1,166 @@ +// Copyright (C) 2015 Michael McMaster +// +// This file is part of SCSI2SD. +// +// SCSI2SD is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// SCSI2SD is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with SCSI2SD. If not, see . + +// For compilers that support precompilation, includes "wx/wx.h". +#include +#ifndef WX_PRECOMP +#include +#endif + +#include + +#include "ConfigUtil.hh" +#include "BoardPanel.hh" + +#include +#include + +#include +#include + +using namespace SCSI2SD; + +namespace +{ + template std::pair + CtrlGetValue(WXCTRL* ctrl) + { + IntType value; + std::stringstream conv; + conv << ctrl->GetValue(); + conv >> value; + return std::make_pair(value, static_cast(conv)); + } + + void CtrlGetFixedString(wxTextEntry* ctrl, char* dest, size_t len) + { + memset(dest, ' ', len); + std::string str(ctrl->GetValue().ToAscii()); + // Don't use strncpy - we need to avoid NULL's + memcpy(dest, str.c_str(), std::min(len, str.size())); + } + + bool CtrlIsAscii(wxTextEntry* ctrl) + { + return ctrl->GetValue().IsAscii(); + } + +} + +BoardPanel::BoardPanel(wxWindow* parent, const BoardConfig& initialConfig) : + wxPanel(parent), + myParent(parent) +{ + wxFlexGridSizer *fgs = new wxFlexGridSizer(6, 2, 9, 25); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myParityCtrl = + new wxCheckBox( + this, + ID_parityCtrl, + _("Enable Parity")); + myParityCtrl->SetToolTip(_("Enable to require valid SCSI parity bits when receiving data. Some hosts don't provide parity. SCSI2SD always outputs valid parity bits.")); + fgs->Add(myParityCtrl); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myUnitAttCtrl = + new wxCheckBox( + this, + ID_unitAttCtrl, + _("Enable Unit Attention")); + myUnitAttCtrl->SetToolTip(_("Enable this to inform the host of changes after hot-swapping SD cards. Causes problems with Mac Plus.")); + fgs->Add(myUnitAttCtrl); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myScsi2Ctrl = + new wxCheckBox( + this, + ID_scsi2Ctrl, + _("Enable SCSI2 Mode")); + myScsi2Ctrl->SetToolTip(_("Enable high-performance mode. May cause problems with SASI/SCSI1 hosts.")); + fgs->Add(myScsi2Ctrl); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myGlitchCtrl = + new wxCheckBox( + this, + ID_glitchCtrl, + _("Disable glitch filter")); + myGlitchCtrl->SetToolTip(_("Improve performance at the cost of noise immunity. Only use with short cables.")); + fgs->Add(myGlitchCtrl); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myCacheCtrl = + new wxCheckBox( + this, + ID_cacheCtrl, + _("Enable disk cache (experimental)")); + myCacheCtrl->SetToolTip(_("SD IO commands aren't completed when SCSI commands complete")); + fgs->Add(myCacheCtrl); + + fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); + myDisconnectCtrl = + new wxCheckBox( + this, + ID_disconnectCtrl, + _("Enable SCSI Disconnect")); + myDisconnectCtrl->SetToolTip(_("Release the SCSI bus while waiting for SD card writes to complete. Must also be enabled in host OS.")); + fgs->Add(myDisconnectCtrl); + + wxBoxSizer* hbox = new wxBoxSizer(wxHORIZONTAL); + hbox->Add(fgs, 1, wxALL | wxEXPAND, 15); + this->SetSizer(hbox); + Centre(); + + setConfig(initialConfig); +} + + +BoardConfig +BoardPanel::getConfig() const +{ + BoardConfig config; + + // Try and keep unknown/unused fields as-is to support newer firmware + // versions. + memcpy(&config, &myConfig, sizeof(config)); + + config.flags = + (myParityCtrl->IsChecked() ? CONFIG_ENABLE_PARITY : 0) | + (myUnitAttCtrl->IsChecked() ? CONFIG_ENABLE_UNIT_ATTENTION : 0) | + (myScsi2Ctrl->IsChecked() ? CONFIG_ENABLE_SCSI2 : 0) | + (myGlitchCtrl->IsChecked() ? CONFIG_DISABLE_GLITCH : 0) | + (myCacheCtrl->IsChecked() ? CONFIG_ENABLE_CACHE: 0) | + (myDisconnectCtrl->IsChecked() ? CONFIG_ENABLE_DISCONNECT: 0); + + return config; +} + +void +BoardPanel::setConfig(const BoardConfig& config) +{ + memcpy(&myConfig, &config, sizeof(config)); + + myParityCtrl->SetValue(config.flags & CONFIG_ENABLE_PARITY); + myUnitAttCtrl->SetValue(config.flags & CONFIG_ENABLE_UNIT_ATTENTION); + myScsi2Ctrl->SetValue(config.flags & CONFIG_ENABLE_SCSI2); + myGlitchCtrl->SetValue(config.flags & CONFIG_DISABLE_GLITCH); + myCacheCtrl->SetValue(config.flags & CONFIG_ENABLE_CACHE); + myDisconnectCtrl->SetValue(config.flags & CONFIG_ENABLE_DISCONNECT); +} + + diff --git a/software/scsi2sd-util/BoardPanel.hh b/software/scsi2sd-util/BoardPanel.hh new file mode 100644 index 00000000..210c2a85 --- /dev/null +++ b/software/scsi2sd-util/BoardPanel.hh @@ -0,0 +1,76 @@ +// Copyright (C) 2015 Michael McMaster +// +// This file is part of SCSI2SD. +// +// SCSI2SD is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// SCSI2SD is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with SCSI2SD. If not, see . +#ifndef BoardPanel_hh +#define BoardPanel_hh + +#include "scsi2sd.h" + + +#include +#include + +#include +#include +#include +#include + +#if __cplusplus >= 201103L +#include +#else +#include +#endif + +#include + +namespace SCSI2SD +{ + +class BoardPanel : public wxPanel +{ +public: + BoardPanel(wxWindow* parent, const BoardConfig& initialConfig); + + BoardConfig getConfig() const; + void setConfig(const BoardConfig& config); + +private: + void initConfig(); + + enum + { + ID_parityCtrl = wxID_HIGHEST + 1, + ID_unitAttCtrl, + ID_scsi2Ctrl, + ID_glitchCtrl, + ID_cacheCtrl, + ID_disconnectCtrl + }; + + wxWindow* myParent; + + BoardConfig myConfig; + + wxCheckBox* myParityCtrl; + wxCheckBox* myUnitAttCtrl; + wxCheckBox* myScsi2Ctrl; + wxCheckBox* myGlitchCtrl; + wxCheckBox* myCacheCtrl; + wxCheckBox* myDisconnectCtrl; +}; + +} // namespace SCSI2SD +#endif diff --git a/software/scsi2sd-util/ConfigUtil.cc b/software/scsi2sd-util/ConfigUtil.cc index 9adfd574..dfcf5265 100644 --- a/software/scsi2sd-util/ConfigUtil.cc +++ b/software/scsi2sd-util/ConfigUtil.cc @@ -82,6 +82,22 @@ namespace } +BoardConfig +ConfigUtil::DefaultBoardConfig() +{ + BoardConfig config; + memset(&config, 0, sizeof(config)); + + memcpy(config.magic, "BCFG", 4); + + + // Default to maximum fail-safe options. + config.flags = 0; + config.selectionDelay = 255; // auto + + return config; +} + TargetConfig ConfigUtil::Default(size_t targetIdx) { @@ -96,7 +112,7 @@ ConfigUtil::Default(size_t targetIdx) config.deviceType = CONFIG_FIXED; // Default to maximum fail-safe options. - config.flags = 0; + config.flagsDEPRECATED = 0; config.deviceTypeModifier = 0; config.sdSectorStart = 0; @@ -149,6 +165,31 @@ ConfigUtil::toBytes(const TargetConfig& _config) return std::vector(begin, begin + sizeof(config)); } +BoardConfig +ConfigUtil::boardConfigFromBytes(const uint8_t* data) +{ + BoardConfig result; + memcpy(&result, data, sizeof(BoardConfig)); + + if (memcmp("BCFG", result.magic, 4)) + { + return DefaultBoardConfig(); + } + + return result; +} + + +std::vector +ConfigUtil::boardConfigToBytes(const BoardConfig& _config) +{ + BoardConfig config(_config); + + memcpy(config.magic, "BCFG", 4); + const uint8_t* begin = reinterpret_cast(&config); + return std::vector(begin, begin + sizeof(config)); +} + std::string ConfigUtil::toXML(const TargetConfig& config) { @@ -162,34 +203,6 @@ ConfigUtil::toXML(const TargetConfig& config) (config.scsiId & CONFIG_TARGET_ENABLED ? "true" : "false") << "\n" << - " " << - (config.flags & CONFIG_ENABLE_UNIT_ATTENTION ? "true" : "false") << - "\n" << - - " " << - (config.flags & CONFIG_ENABLE_PARITY ? "true" : "false") << - "\n" << - - " \n" << - " " << - (config.flags & CONFIG_ENABLE_SCSI2 ? "true" : "false") << - "\n" << - - " \n" << - " " << - (config.flags & CONFIG_DISABLE_GLITCH ? "true" : "false") << - "\n" << - "\n" << " \n" << + " " << + (config.flags & CONFIG_ENABLE_SCSI2 ? "true" : "false") << + "\n" << + + " \n" << + " " << + (config.flags & CONFIG_DISABLE_GLITCH ? "true" : "false") << + "\n" << + + " " << + (config.flags & CONFIG_ENABLE_CACHE ? "true" : "false") << + "\n" << + + " " << + (config.flags & CONFIG_ENABLE_DISCONNECT ? "true" : "false") << + "\n" << + "\n"; + + return s.str(); +} + + static uint64_t parseInt(wxXmlNode* node, uint64_t limit) { std::string str(node->GetNodeContent().mb_str()); @@ -323,54 +384,6 @@ parseTarget(wxXmlNode* node) result.scsiId = result.scsiId & ~CONFIG_TARGET_ENABLED; } } - else if (child->GetName() == "unitAttention") - { - std::string s(child->GetNodeContent().mb_str()); - if (s == "true") - { - result.flags |= CONFIG_ENABLE_UNIT_ATTENTION; - } - else - { - result.flags = result.flags & ~CONFIG_ENABLE_UNIT_ATTENTION; - } - } - else if (child->GetName() == "parity") - { - std::string s(child->GetNodeContent().mb_str()); - if (s == "true") - { - result.flags |= CONFIG_ENABLE_PARITY; - } - else - { - result.flags = result.flags & ~CONFIG_ENABLE_PARITY; - } - } - else if (child->GetName() == "enableScsi2") - { - std::string s(child->GetNodeContent().mb_str()); - if (s == "true") - { - result.flags |= CONFIG_ENABLE_SCSI2; - } - else - { - result.flags = result.flags & ~CONFIG_ENABLE_SCSI2; - } - } - else if (child->GetName() == "disableGlitchFilter") - { - std::string s(child->GetNodeContent().mb_str()); - if (s == "true") - { - result.flags |= CONFIG_DISABLE_GLITCH; - } - else - { - result.flags = result.flags & ~CONFIG_DISABLE_GLITCH; - } - } else if (child->GetName() == "quirks") { std::stringstream s(std::string(child->GetNodeContent().mb_str())); @@ -445,7 +458,93 @@ parseTarget(wxXmlNode* node) return result; } -std::vector +static BoardConfig +parseBoardConfig(wxXmlNode* node) +{ + BoardConfig result = ConfigUtil::DefaultBoardConfig(); + + wxXmlNode *child = node->GetChildren(); + while (child) + { + if (child->GetName() == "unitAttention") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_ENABLE_UNIT_ATTENTION; + } + else + { + result.flags = result.flags & ~CONFIG_ENABLE_UNIT_ATTENTION; + } + } + else if (child->GetName() == "parity") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_ENABLE_PARITY; + } + else + { + result.flags = result.flags & ~CONFIG_ENABLE_PARITY; + } + } + else if (child->GetName() == "enableScsi2") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_ENABLE_SCSI2; + } + else + { + result.flags = result.flags & ~CONFIG_ENABLE_SCSI2; + } + } + else if (child->GetName() == "disableGlitchFilter") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_DISABLE_GLITCH; + } + else + { + result.flags = result.flags & ~CONFIG_DISABLE_GLITCH; + } + } + else if (child->GetName() == "enableCache") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_ENABLE_CACHE; + } + else + { + result.flags = result.flags & ~CONFIG_ENABLE_CACHE; + } + } + else if (child->GetName() == "enableDisconnect") + { + std::string s(child->GetNodeContent().mb_str()); + if (s == "true") + { + result.flags |= CONFIG_ENABLE_DISCONNECT; + } + else + { + result.flags = result.flags & ~CONFIG_ENABLE_DISCONNECT; + } + } + child = child->GetNext(); + } + return result; +} + + +std::pair> ConfigUtil::fromXML(const std::string& filename) { wxXmlDocument doc; @@ -460,16 +559,29 @@ ConfigUtil::fromXML(const std::string& filename) throw std::runtime_error("Invalid root node, expected "); } - std::vector result; + BoardConfig boardConfig = DefaultBoardConfig(); + int boardConfigFound = 0; + + std::vector targets; wxXmlNode *child = doc.GetRoot()->GetChildren(); while (child) { if (child->GetName() == "SCSITarget") { - result.push_back(parseTarget(child)); + targets.push_back(parseTarget(child)); + } + else if (child->GetName() == "BoardConfig") + { + boardConfig = parseBoardConfig(child); + boardConfigFound = 1; } child = child->GetNext(); } - return result; + + if (!boardConfigFound && targets.size() > 0) + { + boardConfig.flags = targets[0].flagsDEPRECATED; + } + return make_pair(boardConfig, targets); } diff --git a/software/scsi2sd-util/ConfigUtil.hh b/software/scsi2sd-util/ConfigUtil.hh index 94991737..53ac5ce1 100644 --- a/software/scsi2sd-util/ConfigUtil.hh +++ b/software/scsi2sd-util/ConfigUtil.hh @@ -22,6 +22,7 @@ #include #include #include +#include namespace SCSI2SD { @@ -29,13 +30,18 @@ namespace SCSI2SD { public: + static BoardConfig DefaultBoardConfig(); static TargetConfig Default(size_t targetIdx); static TargetConfig fromBytes(const uint8_t* data); static std::vector toBytes(const TargetConfig& config); + static BoardConfig boardConfigFromBytes(const uint8_t* data); + static std::vector boardConfigToBytes(const BoardConfig& config); + static std::string toXML(const TargetConfig& config); - static std::vector fromXML(const std::string& filename); + static std::string toXML(const BoardConfig& config); + static std::pair> fromXML(const std::string& filename); }; } diff --git a/software/scsi2sd-util/Makefile b/software/scsi2sd-util/Makefile index 27b0706e..33714634 100755 --- a/software/scsi2sd-util/Makefile +++ b/software/scsi2sd-util/Makefile @@ -30,7 +30,7 @@ endif ifeq ($(USE_SYSTEM_WX),Yes) LDFLAGS_WX=$(shell wx-config-3.0 --libs) else -LDFLAGS_WX=$(shell $(BUILD)/wx-config --libs) +LDFLAGS_WX=$(shell $(BUILD)/wx/wx-config --libs) endif CPPFLAGS = -I cybootloaderutils $(CPPFLAGS_HIDAPI) -I. -I ../include -Ilibzipper-1.0.4 $(CPPFLAGS_ZLIB) @@ -50,7 +50,7 @@ TARGET ?= $(shell uname -s) ifeq ($(TARGET),Win32) VPATH += hidapi/windows LDFLAGS += -static -mconsole -mwindows -lsetupapi - BUILD = build/windows/32bit + BUILD := $(PWD)/build/windows/32bit CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LIBZIPPER_CONFIG+=--host=i686-w64-mingw32 @@ -60,7 +60,7 @@ endif ifeq ($(TARGET),Win64) VPATH += hidapi/windows LDFLAGS += -static -mconsole -mwindows -lsetupapi - BUILD = build/windows/64bit + BUILD := $(PWD)/build/windows/64bit CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ LIBZIPPER_CONFIG+=--host=x86_64-w64-mingw32 @@ -70,7 +70,7 @@ endif ifeq ($(TARGET),Linux) VPATH += hidapi/linux LDFLAGS += -ludev -lexpat - BUILD = build/linux + BUILD := $(PWD)/build/linux endif ifeq ($(TARGET),Darwin) # Should match OSX @@ -79,7 +79,7 @@ ifeq ($(TARGET),Darwin) CC=clang -mmacosx-version-min=10.7 CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7 WX_CONFIG += --with-macosx-version-min=10.7 - BUILD=build/mac + BUILD := $(PWD)/build/mac endif export CC CXX @@ -103,6 +103,7 @@ OBJ = \ $(CYAPI) $(HIDAPI) \ $(BUILD)/ConfigUtil.o \ $(BUILD)/Firmware.o \ + $(BUILD)/BoardPanel.o \ $(BUILD)/TargetPanel.o \ $(BUILD)/SCSI2SD_Bootloader.o \ $(BUILD)/SCSI2SD_HID.o \ @@ -129,16 +130,16 @@ $(BUILD)/zlib/buildstamp: endif ifneq ($(USE_SYSTEM_WX),Yes) -$(OBJ): $(BUILD)/wx.buildstamp -$(EXEOBJ): $(BUILD)/wx.buildstamp +$(OBJ): $(BUILD)/wx/buildstamp +$(EXEOBJ): $(BUILD)/wx/buildstamp ifneq ($(USE_SYSTEM_ZLIB),Yes) -$(BUILD)/wx.buildstamp: $(BUILD)/zlib/buildstamp +$(BUILD)/wx/buildstamp: $(BUILD)/zlib/buildstamp else -$(BUILD)/wx.buildstamp: +$(BUILD)/wx/buildstamp: endif mkdir -p $(dir $@) ( \ - cd $(BUILD) && \ + cd $(dir $@) && \ $(CURDIR)/wxWidgets/configure $(WX_CONFIG) CPPFLAGS="$(CPPFLAGS_ZLIB)" LDFLAGS="$(LDFLAGS_ZLIB)" && \ $(MAKE) \ ) && \ @@ -171,7 +172,7 @@ $(BUILD)/%.o: %.c $(BUILD)/%.o: %.cc mkdir -p $(dir $@) ifneq ($(USE_SYSTEM_WX),Yes) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) `$(BUILD)/wx-config --cxxflags` $< -c -o $@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) `$(BUILD)/wx/wx-config --cxxflags` $< -c -o $@ else $(CXX) $(CPPFLAGS) $(CXXFLAGS) `wx-config-3.0 --cxxflags` $< -c -o $@ endif @@ -201,5 +202,6 @@ dist: cybootloaderutils Firmware.cc Firmware.hh libzipper-1.0.4 Makefile \ SCSI2SD_Bootloader.cc SCSI2SD_Bootloader.hh SCSI2SD_HID.cc SCSI2SD_HID.hh \ scsi2sd-monitor.cc scsi2sd-util.cc TargetPanel.cc TargetPanel.hh \ + BoardPanel.cc BoardPanel.hh \ $(NAME)-$(VERSION) tar jcvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) diff --git a/software/scsi2sd-util/TargetPanel.cc b/software/scsi2sd-util/TargetPanel.cc index eb04e554..a49deb77 100644 --- a/software/scsi2sd-util/TargetPanel.cc +++ b/software/scsi2sd-util/TargetPanel.cc @@ -72,21 +72,21 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) : myNumSectorValidator(new wxIntegerValidator), mySizeValidator(new wxFloatingPointValidator(2)) { - wxFlexGridSizer *fgs = new wxFlexGridSizer(13, 3, 9, 25); + wxFlexGridSizer *fgs = new wxFlexGridSizer(11, 3, 9, 25); fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); myEnableCtrl = new wxCheckBox( this, ID_enableCtrl, - wxT("Enable SCSI Target")); + _("Enable SCSI Target")); fgs->Add(myEnableCtrl); // Set a non-visible string to leave room in the column for future messages fgs->Add(new wxStaticText(this, wxID_ANY, wxT(" "))); Bind(wxEVT_CHECKBOX, &TargetPanel::onInput, this, ID_enableCtrl); - fgs->Add(new wxStaticText(this, wxID_ANY, wxT("SCSI ID"))); + fgs->Add(new wxStaticText(this, wxID_ANY, _("SCSI ID"))); myScsiIdCtrl = new wxSpinCtrl (this, @@ -103,14 +103,14 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) : fgs->Add(myScsiIdMsg); Bind(wxEVT_SPINCTRL, &TargetPanel::onInput, this, ID_scsiIdCtrl); - fgs->Add(new wxStaticText(this, wxID_ANY, wxT("Device Type"))); + fgs->Add(new wxStaticText(this, wxID_ANY, _("Device Type"))); wxString deviceTypes[] = { - wxT("Hard Drive"), - wxT("Removable"), - wxT("CDROM"), - wxT("3.5\" Floppy"), - wxT("Magneto optical") + _("Hard Drive"), + _("Removable"), + _("CDROM"), + _("3.5\" Floppy"), + _("Magneto optical") }; myDeviceTypeCtrl = new wxChoice( @@ -126,44 +126,6 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) : fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); Bind(wxEVT_CHOICE, &TargetPanel::onInput, this, ID_deviceTypeCtrl); - fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); - myParityCtrl = - new wxCheckBox( - this, - ID_parityCtrl, - wxT("Enable Parity")); - myParityCtrl->SetToolTip(wxT("Enable to require valid SCSI parity bits when receiving data. Some hosts don't provide parity. SCSI2SD always outputs valid parity bits.")); - fgs->Add(myParityCtrl); - Bind(wxEVT_CHECKBOX, &TargetPanel::onInput, this, ID_parityCtrl); - - myUnitAttCtrl = - new wxCheckBox( - this, - ID_unitAttCtrl, - wxT("Enable Unit Attention")); - myUnitAttCtrl->SetToolTip(wxT("Enable this to inform the host of changes after hot-swapping SD cards. Causes problems with Mac Plus.")); - fgs->Add(myUnitAttCtrl); - Bind(wxEVT_CHECKBOX, &TargetPanel::onInput, this, ID_unitAttCtrl); - - fgs->Add(new wxStaticText(this, wxID_ANY, wxT(""))); - myScsi2Ctrl = - new wxCheckBox( - this, - ID_scsi2Ctrl, - wxT("Enable SCSI2 Mode")); - myScsi2Ctrl->SetToolTip(wxT("Enable high-performance mode. May cause problems with SASI/SCSI1 hosts.")); - fgs->Add(myScsi2Ctrl); - Bind(wxEVT_CHECKBOX, &TargetPanel::onInput, this, ID_scsi2Ctrl); - - myGlitchCtrl = - new wxCheckBox( - this, - ID_glitchCtrl, - wxT("Disable glitch filter")); - myGlitchCtrl->SetToolTip(wxT("Improve performance at the cost of noise immunity. Only use with short cables.")); - fgs->Add(myGlitchCtrl); - Bind(wxEVT_CHECKBOX, &TargetPanel::onInput, this, ID_glitchCtrl); - fgs->Add(new wxStaticText(this, wxID_ANY, wxT("SD card start sector"))); wxWrapSizer* startContainer = new wxWrapSizer(); myStartSDSectorCtrl = @@ -334,10 +296,6 @@ TargetPanel::evaluate() { myScsiIdCtrl->Enable(enabled); myDeviceTypeCtrl->Enable(enabled); - myParityCtrl->Enable(enabled); - myUnitAttCtrl->Enable(enabled); - myScsi2Ctrl->Enable(enabled); - myGlitchCtrl->Enable(enabled); myStartSDSectorCtrl->Enable(enabled && !myAutoStartSectorCtrl->IsChecked()); myAutoStartSectorCtrl->Enable(enabled); mySectorSizeCtrl->Enable(enabled); @@ -568,12 +526,6 @@ TargetPanel::getConfig() const config.deviceType = myDeviceTypeCtrl->GetSelection(); - config.flags = - (myParityCtrl->IsChecked() ? CONFIG_ENABLE_PARITY : 0) | - (myUnitAttCtrl->IsChecked() ? CONFIG_ENABLE_UNIT_ATTENTION : 0) | - (myScsi2Ctrl->IsChecked() ? CONFIG_ENABLE_SCSI2 : 0) | - (myGlitchCtrl->IsChecked() ? CONFIG_DISABLE_GLITCH : 0); - auto startSDSector = CtrlGetValue(myStartSDSectorCtrl); config.sdSectorStart = startSDSector.first; valid = valid && startSDSector.second; @@ -604,11 +556,6 @@ TargetPanel::setConfig(const TargetConfig& config) myDeviceTypeCtrl->SetSelection(config.deviceType); - myParityCtrl->SetValue(config.flags & CONFIG_ENABLE_PARITY); - myUnitAttCtrl->SetValue(config.flags & CONFIG_ENABLE_UNIT_ATTENTION); - myScsi2Ctrl->SetValue(config.flags & CONFIG_ENABLE_SCSI2); - myGlitchCtrl->SetValue(config.flags & CONFIG_DISABLE_GLITCH); - { std::stringstream ss; ss << config.sdSectorStart; myStartSDSectorCtrl->ChangeValue(ss.str()); diff --git a/software/scsi2sd-util/TargetPanel.hh b/software/scsi2sd-util/TargetPanel.hh index 3fc28cb1..d3fdb8f4 100644 --- a/software/scsi2sd-util/TargetPanel.hh +++ b/software/scsi2sd-util/TargetPanel.hh @@ -77,10 +77,6 @@ private: ID_enableCtrl = wxID_HIGHEST + 1, ID_scsiIdCtrl, ID_deviceTypeCtrl, - ID_parityCtrl, - ID_unitAttCtrl, - ID_scsi2Ctrl, - ID_glitchCtrl, ID_startSDSectorCtrl, ID_autoStartSectorCtrl, ID_sectorSizeCtrl, @@ -112,11 +108,6 @@ private: wxChoice* myDeviceTypeCtrl; - wxCheckBox* myParityCtrl; - wxCheckBox* myUnitAttCtrl; - wxCheckBox* myScsi2Ctrl; - wxCheckBox* myGlitchCtrl; - wxIntegerValidator* myStartSDSectorValidator; wxTextCtrl* myStartSDSectorCtrl; wxCheckBox* myAutoStartSectorCtrl; diff --git a/software/scsi2sd-util/scsi2sd-util.cc b/software/scsi2sd-util/scsi2sd-util.cc index 4c312e9a..b111d8ed 100644 --- a/software/scsi2sd-util/scsi2sd-util.cc +++ b/software/scsi2sd-util/scsi2sd-util.cc @@ -38,6 +38,7 @@ #include #include "ConfigUtil.hh" +#include "BoardPanel.hh" #include "TargetPanel.hh" #include "SCSI2SD_Bootloader.hh" #include "SCSI2SD_HID.hh" @@ -157,7 +158,7 @@ class AppFrame : public wxFrame { public: AppFrame() : - wxFrame(NULL, wxID_ANY, "scsi2sd-util", wxPoint(50, 50), wxSize(600, 700)), + wxFrame(NULL, wxID_ANY, "scsi2sd-util", wxPoint(50, 50), wxSize(600, 650)), myInitialConfig(false), myTickCounter(0), myLastPollTime(0) @@ -165,49 +166,49 @@ public: wxMenu *menuFile = new wxMenu(); menuFile->Append( ID_SaveFile, - "&Save to file...", - "Save settings to local file."); + _("&Save to file..."), + _("Save settings to local file.")); menuFile->Append( ID_OpenFile, - "&Open file...", - "Load settings from local file."); + _("&Open file..."), + _("Load settings from local file.")); menuFile->AppendSeparator(); menuFile->Append( ID_ConfigDefaults, - "Load &Defaults", - "Load default configuration options."); + _("Load &Defaults"), + _("Load default configuration options.")); menuFile->Append( ID_Firmware, - "&Upgrade Firmware...", - "Upgrade or inspect device firmware version."); + _("&Upgrade Firmware..."), + _("Upgrade or inspect device firmware version.")); menuFile->AppendSeparator(); menuFile->Append(wxID_EXIT); wxMenu *menuWindow= new wxMenu(); menuWindow->Append( ID_LogWindow, - "Show &Log", - "Show debug log window"); + _("Show &Log"), + _("Show debug log window")); wxMenu *menuDebug = new wxMenu(); mySCSILogChk = menuDebug->AppendCheckItem( ID_SCSILog, - "Log SCSI data", - "Log SCSI commands"); + _("Log SCSI data"), + _("Log SCSI commands")); mySelfTestChk = menuDebug->AppendCheckItem( ID_SelfTest, - "SCSI Standalone Self-Test", - "SCSI Standalone Self-Test"); + _("SCSI Standalone Self-Test"), + _("SCSI Standalone Self-Test")); wxMenu *menuHelp = new wxMenu(); menuHelp->Append(wxID_ABOUT); wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append( menuFile, "&File" ); - menuBar->Append( menuDebug, "&Debug" ); - menuBar->Append( menuWindow, "&Window" ); - menuBar->Append( menuHelp, "&Help" ); + menuBar->Append( menuFile, _("&File") ); + menuBar->Append( menuDebug, _("&Debug") ); + menuBar->Append( menuWindow, _("&Window") ); + menuBar->Append( menuHelp, _("&Help") ); SetMenuBar( menuBar ); CreateStatusBar(); @@ -221,7 +222,8 @@ public: fgs->Add(5, 5, wxALL); wxNotebook* tabs = new wxNotebook(cfgPanel, ID_Notebook); - + myBoardPanel = new BoardPanel(tabs, ConfigUtil::DefaultBoardConfig()); + tabs->AddPage(myBoardPanel, _("General Settings")); for (int i = 0; i < MAX_SCSI_TARGETS; ++i) { TargetPanel* target = @@ -240,10 +242,10 @@ public: wxFlexGridSizer *btnFgs = new wxFlexGridSizer(1, 2, 5, 5); btnPanel->SetSizer(btnFgs); myLoadButton = - new wxButton(btnPanel, ID_BtnLoad, wxT("Load from device")); + new wxButton(btnPanel, ID_BtnLoad, _("Load from device")); btnFgs->Add(myLoadButton); mySaveButton = - new wxButton(btnPanel, ID_BtnSave, wxT("Save to device")); + new wxButton(btnPanel, ID_BtnSave, _("Save to device")); btnFgs->Add(mySaveButton); fgs->Add(btnPanel); @@ -253,7 +255,7 @@ public: //Fit(); // Needed to reduce window size on Windows FitInside(); // Needed on Linux to prevent status bar overlap - myLogWindow = new wxLogWindow(this, wxT("scsi2sd-util debug log"), true); + myLogWindow = new wxLogWindow(this, _("scsi2sd-util debug log"), true); myLogWindow->PassMessages(false); // Prevent messagebox popups myTimer = new wxTimer(this, ID_Timer); @@ -262,6 +264,7 @@ public: private: wxLogWindow* myLogWindow; + BoardPanel* myBoardPanel; std::vector myTargets; wxButton* myLoadButton; wxButton* mySaveButton; @@ -407,6 +410,7 @@ private: s << "\n"; + s << ConfigUtil::toXML(myBoardPanel->getConfig()); for (size_t i = 0; i < myTargets.size(); ++i) { s << ConfigUtil::toXML(myTargets[i]->getConfig()); @@ -430,13 +434,15 @@ private: try { - std::vector configs( + std::pair> configs( ConfigUtil::fromXML(std::string(dlg.GetPath()))); + myBoardPanel->setConfig(configs.first); + size_t i; - for (i = 0; i < configs.size() && i < myTargets.size(); ++i) + for (i = 0; i < configs.second.size() && i < myTargets.size(); ++i) { - myTargets[i]->setConfig(configs[i]); + myTargets[i]->setConfig(configs.second[i]); } for (; i < myTargets.size(); ++i) @@ -560,7 +566,7 @@ private: mmLogStatus(msg.str()); tmpFile = wxFileName::CreateTempFileName( - wxT("SCSI2SD_Firmware"), static_cast(NULL) + _("SCSI2SD_Firmware"), static_cast(NULL) ); zipper::FileWriter out(tmpFile); (*it)->decompress(out); @@ -830,9 +836,43 @@ private: wxPD_CAN_ABORT | wxPD_REMAINING_TIME) ); - int flashRow = SCSI_CONFIG_0_ROW; int currentProgress = 0; - int totalProgress = myTargets.size() * SCSI_CONFIG_ROWS; + int totalProgress = myTargets.size() * SCSI_CONFIG_ROWS + 1; + + // Read board config first. + std::vector boardCfgFlashData; + int flashRow = SCSI_CONFIG_BOARD_ROW; + { + std::stringstream ss; + ss << "Reading flash array " << SCSI_CONFIG_ARRAY << + " row " << flashRow; + mmLogStatus(ss.str()); + currentProgress += 1; + + if (!progress->Update( + (100 * currentProgress) / totalProgress, + ss.str() + ) + ) + { + goto abort; + } + + try + { + myHID->readFlashRow( + SCSI_CONFIG_ARRAY, flashRow, boardCfgFlashData); + myBoardPanel->setConfig( + ConfigUtil::boardConfigFromBytes(&boardCfgFlashData[0])); + } + catch (std::runtime_error& e) + { + mmLogStatus(e.what()); + goto err; + } + } + + flashRow = SCSI_CONFIG_0_ROW; for (size_t i = 0; i < myTargets.size(); ++i, flashRow += SCSI_CONFIG_ROWS) @@ -883,6 +923,13 @@ private: myTargets[i]->setConfig(ConfigUtil::fromBytes(&raw[0])); } + // Support old boards without board config set + if (memcmp(&boardCfgFlashData[0], "BCFG", 4)) { + BoardConfig defCfg = ConfigUtil::DefaultBoardConfig(); + defCfg.flags = myTargets[0]->getConfig().flagsDEPRECATED; + myBoardPanel->setConfig(defCfg); + } + myInitialConfig = true; goto out; @@ -914,9 +961,43 @@ private: wxPD_CAN_ABORT | wxPD_REMAINING_TIME) ); - int flashRow = SCSI_CONFIG_0_ROW; + int currentProgress = 0; - int totalProgress = myTargets.size() * SCSI_CONFIG_ROWS; + int totalProgress = myTargets.size() * SCSI_CONFIG_ROWS + 1; + + // Write board config first. + int flashRow = SCSI_CONFIG_BOARD_ROW; + { + std::stringstream ss; + ss << "Programming flash array " << SCSI_CONFIG_ARRAY << + " row " << flashRow; + mmLogStatus(ss.str()); + currentProgress += 1; + + if (!progress->Update( + (100 * currentProgress) / totalProgress, + ss.str() + ) + ) + { + goto abort; + } + + std::vector flashData = + ConfigUtil::boardConfigToBytes(myBoardPanel->getConfig()); + try + { + myHID->writeFlashRow( + SCSI_CONFIG_ARRAY, flashRow, flashData); + } + catch (std::runtime_error& e) + { + mmLogStatus(e.what()); + goto err; + } + } + + flashRow = SCSI_CONFIG_0_ROW; for (size_t i = 0; i < myTargets.size(); ++i, flashRow += SCSI_CONFIG_ROWS) diff --git a/software/scsi2sd-util/wxWidgets/Makefile.in b/software/scsi2sd-util/wxWidgets/Makefile.in index e4296e24..12211904 100644 --- a/software/scsi2sd-util/wxWidgets/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/Makefile.in @@ -76,7 +76,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 WX_RELEASE_NODOT = 30 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -1775,6 +1775,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_scrol.o \ xrcdll_xh_scwin.o \ xrcdll_xh_htmllbox.o \ + xrcdll_xh_simplebook.o \ xrcdll_xh_sizer.o \ xrcdll_xh_slidr.o \ xrcdll_xh_spin.o \ @@ -1847,6 +1848,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_scrol.o \ xrclib_xh_scwin.o \ xrclib_xh_htmllbox.o \ + xrclib_xh_simplebook.o \ xrclib_xh_sizer.o \ xrclib_xh_slidr.o \ xrclib_xh_spin.o \ @@ -2086,7 +2088,7 @@ LOCALE_MSW_LINGUAS = it @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 3.0 -current_version 3.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -4374,6 +4376,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_scrol.h \ wx/xrc/xh_scwin.h \ wx/xrc/xh_htmllbox.h \ + wx/xrc/xh_simplebook.h \ wx/xrc/xh_sizer.h \ wx/xrc/xh_slidr.h \ wx/xrc/xh_spin.h \ @@ -4699,6 +4702,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_scrol.o \ monodll_xh_scwin.o \ monodll_xh_htmllbox.o \ + monodll_xh_simplebook.o \ monodll_xh_sizer.o \ monodll_xh_slidr.o \ monodll_xh_spin.o \ @@ -6951,6 +6955,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_scrol.o \ monolib_xh_scwin.o \ monolib_xh_htmllbox.o \ + monolib_xh_simplebook.o \ monolib_xh_sizer.o \ monolib_xh_slidr.o \ monolib_xh_spin.o \ @@ -15194,9 +15199,9 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.2.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0 @@ -18704,6 +18709,9 @@ monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP) monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp +monodll_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp + monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -24578,6 +24586,9 @@ monolib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONOLIB_ODEP) monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp +monolib_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp + monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -39980,6 +39991,9 @@ xrcdll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCDLL_ODEP) xrcdll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp +xrcdll_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp + xrcdll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp @@ -40175,6 +40189,9 @@ xrclib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(XRCLIB_ODEP) xrclib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp +xrclib_xh_simplebook.o: $(srcdir)/src/xrc/xh_simplebook.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_simplebook.cpp + xrclib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp diff --git a/software/scsi2sd-util/wxWidgets/build/bakefiles/Bakefiles.bkgen b/software/scsi2sd-util/wxWidgets/build/bakefiles/Bakefiles.bkgen index bb4feceb..d908e6f3 100644 --- a/software/scsi2sd-util/wxWidgets/build/bakefiles/Bakefiles.bkgen +++ b/software/scsi2sd-util/wxWidgets/build/bakefiles/Bakefiles.bkgen @@ -143,6 +143,11 @@ -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln + + -DMSVS_PLATFORMS=win32,win64 + + + diff --git a/software/scsi2sd-util/wxWidgets/build/bakefiles/common.bkl b/software/scsi2sd-util/wxWidgets/build/bakefiles/common.bkl index 78915bc7..1b4d4c01 100644 --- a/software/scsi2sd-util/wxWidgets/build/bakefiles/common.bkl +++ b/software/scsi2sd-util/wxWidgets/build/bakefiles/common.bkl @@ -31,6 +31,8 @@ _$(CPU) + _x64 + _x64 _x64 _x64 _ia64 diff --git a/software/scsi2sd-util/wxWidgets/build/bakefiles/config.bkl b/software/scsi2sd-util/wxWidgets/build/bakefiles/config.bkl index 7484df05..8e257297 100644 --- a/software/scsi2sd-util/wxWidgets/build/bakefiles/config.bkl +++ b/software/scsi2sd-util/wxWidgets/build/bakefiles/config.bkl @@ -474,8 +474,8 @@ it if SHARED=1 unless you know what you are doing. WINCE WINCE WINCE - $(WIN32_TOOLKIT) - $(WIN32_TOOLKIT) + $(WIN32_TOOLKIT) + $(WIN32_TOOLKIT) $(WIN32_TOOLKIT) PM @@ -483,8 +483,8 @@ it if SHARED=1 unless you know what you are doing. wince wince wince - $(WIN32_TOOLKIT_LOWERCASE) - $(WIN32_TOOLKIT_LOWERCASE) + $(WIN32_TOOLKIT_LOWERCASE) + $(WIN32_TOOLKIT_LOWERCASE) $(WIN32_TOOLKIT_LOWERCASE) pm diff --git a/software/scsi2sd-util/wxWidgets/build/bakefiles/files.bkl b/software/scsi2sd-util/wxWidgets/build/bakefiles/files.bkl index 5accfff7..6c32a7bd 100644 --- a/software/scsi2sd-util/wxWidgets/build/bakefiles/files.bkl +++ b/software/scsi2sd-util/wxWidgets/build/bakefiles/files.bkl @@ -3497,6 +3497,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/xrc/xh_scrol.cpp src/xrc/xh_scwin.cpp src/xrc/xh_htmllbox.cpp + src/xrc/xh_simplebook.cpp src/xrc/xh_sizer.cpp src/xrc/xh_slidr.cpp src/xrc/xh_spin.cpp @@ -3565,6 +3566,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_htmllbox.h + wx/xrc/xh_simplebook.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h diff --git a/software/scsi2sd-util/wxWidgets/build/bakefiles/version.bkl b/software/scsi2sd-util/wxWidgets/build/bakefiles/version.bkl index 33edf8db..73bd43ca 100644 --- a/software/scsi2sd-util/wxWidgets/build/bakefiles/version.bkl +++ b/software/scsi2sd-util/wxWidgets/build/bakefiles/version.bkl @@ -22,9 +22,9 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 1 + 2 0 - 1 + 2 diff --git a/software/scsi2sd-util/wxWidgets/build/msw/makefile.bcc b/software/scsi2sd-util/wxWidgets/build/msw/makefile.bcc index 9673acc8..bc7d5c13 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/makefile.bcc +++ b/software/scsi2sd-util/wxWidgets/build/msw/makefile.bcc @@ -1238,6 +1238,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \ + $(OBJS)\xrcdll_xh_simplebook.obj \ $(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_spin.obj \ @@ -1314,6 +1315,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \ + $(OBJS)\xrclib_xh_simplebook.obj \ $(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_spin.obj \ @@ -1706,6 +1708,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_htmllbox.obj \ + $(OBJS)\monodll_xh_simplebook.obj \ $(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_spin.obj \ @@ -2512,6 +2515,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_htmllbox.obj \ + $(OBJS)\monolib_xh_simplebook.obj \ $(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_spin.obj \ @@ -5484,7 +5488,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -7191,6 +7195,9 @@ $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\monodll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -9659,6 +9666,9 @@ $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\monolib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -15561,6 +15571,9 @@ $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\xrcdll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -15759,6 +15772,9 @@ $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\xrclib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp diff --git a/software/scsi2sd-util/wxWidgets/build/msw/makefile.gcc b/software/scsi2sd-util/wxWidgets/build/msw/makefile.gcc index 59b2f13c..c04b484f 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/makefile.gcc +++ b/software/scsi2sd-util/wxWidgets/build/msw/makefile.gcc @@ -1239,6 +1239,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_scrol.o \ $(OBJS)\xrcdll_xh_scwin.o \ $(OBJS)\xrcdll_xh_htmllbox.o \ + $(OBJS)\xrcdll_xh_simplebook.o \ $(OBJS)\xrcdll_xh_sizer.o \ $(OBJS)\xrcdll_xh_slidr.o \ $(OBJS)\xrcdll_xh_spin.o \ @@ -1314,6 +1315,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_scrol.o \ $(OBJS)\xrclib_xh_scwin.o \ $(OBJS)\xrclib_xh_htmllbox.o \ + $(OBJS)\xrclib_xh_simplebook.o \ $(OBJS)\xrclib_xh_sizer.o \ $(OBJS)\xrclib_xh_slidr.o \ $(OBJS)\xrclib_xh_spin.o \ @@ -1720,6 +1722,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_scrol.o \ $(OBJS)\monodll_xh_scwin.o \ $(OBJS)\monodll_xh_htmllbox.o \ + $(OBJS)\monodll_xh_simplebook.o \ $(OBJS)\monodll_xh_sizer.o \ $(OBJS)\monodll_xh_slidr.o \ $(OBJS)\monodll_xh_spin.o \ @@ -2532,6 +2535,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_scrol.o \ $(OBJS)\monolib_xh_scwin.o \ $(OBJS)\monolib_xh_htmllbox.o \ + $(OBJS)\monolib_xh_simplebook.o \ $(OBJS)\monolib_xh_sizer.o \ $(OBJS)\monolib_xh_slidr.o \ $(OBJS)\monolib_xh_spin.o \ @@ -5655,7 +5659,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -7362,6 +7366,9 @@ $(OBJS)\monodll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(OBJS)\monodll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9830,6 +9837,9 @@ $(OBJS)\monolib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(OBJS)\monolib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15732,6 +15742,9 @@ $(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(OBJS)\xrcdll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15930,6 +15943,9 @@ $(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp $(OBJS)\xrclib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_simplebook.o: ../../src/xrc/xh_simplebook.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/software/scsi2sd-util/wxWidgets/build/msw/makefile.vc b/software/scsi2sd-util/wxWidgets/build/msw/makefile.vc index 2f43310b..a535253d 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/makefile.vc +++ b/software/scsi2sd-util/wxWidgets/build/msw/makefile.vc @@ -1367,6 +1367,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \ + $(OBJS)\xrcdll_xh_simplebook.obj \ $(OBJS)\xrcdll_xh_sizer.obj \ $(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_spin.obj \ @@ -1449,6 +1450,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \ + $(OBJS)\xrclib_xh_simplebook.obj \ $(OBJS)\xrclib_xh_sizer.obj \ $(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_spin.obj \ @@ -2000,6 +2002,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_htmllbox.obj \ + $(OBJS)\monodll_xh_simplebook.obj \ $(OBJS)\monodll_xh_sizer.obj \ $(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_spin.obj \ @@ -2812,6 +2815,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_htmllbox.obj \ + $(OBJS)\monolib_xh_simplebook.obj \ $(OBJS)\monolib_xh_sizer.obj \ $(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_spin.obj \ @@ -6170,7 +6174,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -7877,6 +7881,9 @@ $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\monodll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -10345,6 +10352,9 @@ $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\monolib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -16247,6 +16257,9 @@ $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\xrcdll_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp @@ -16445,6 +16458,9 @@ $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp +$(OBJS)\xrclib_xh_simplebook.obj: ..\..\src\xrc\xh_simplebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_simplebook.cpp + $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp diff --git a/software/scsi2sd-util/wxWidgets/build/msw/makefile.wat b/software/scsi2sd-util/wxWidgets/build/msw/makefile.wat index 674ef379..1f5e95a6 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/makefile.wat +++ b/software/scsi2sd-util/wxWidgets/build/msw/makefile.wat @@ -195,6 +195,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_scrol.obj & $(OBJS)\monodll_xh_scwin.obj & $(OBJS)\monodll_xh_htmllbox.obj & + $(OBJS)\monodll_xh_simplebook.obj & $(OBJS)\monodll_xh_sizer.obj & $(OBJS)\monodll_xh_slidr.obj & $(OBJS)\monodll_xh_spin.obj & @@ -1012,6 +1013,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_scrol.obj & $(OBJS)\monolib_xh_scwin.obj & $(OBJS)\monolib_xh_htmllbox.obj & + $(OBJS)\monolib_xh_simplebook.obj & $(OBJS)\monolib_xh_sizer.obj & $(OBJS)\monolib_xh_slidr.obj & $(OBJS)\monolib_xh_spin.obj & @@ -4852,6 +4854,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_scrol.obj & $(OBJS)\xrcdll_xh_scwin.obj & $(OBJS)\xrcdll_xh_htmllbox.obj & + $(OBJS)\xrcdll_xh_simplebook.obj & $(OBJS)\xrcdll_xh_sizer.obj & $(OBJS)\xrcdll_xh_slidr.obj & $(OBJS)\xrcdll_xh_spin.obj & @@ -4928,6 +4931,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_scrol.obj & $(OBJS)\xrclib_xh_scwin.obj & $(OBJS)\xrclib_xh_htmllbox.obj & + $(OBJS)\xrclib_xh_simplebook.obj & $(OBJS)\xrclib_xh_sizer.obj & $(OBJS)\xrclib_xh_slidr.obj & $(OBJS)\xrclib_xh_spin.obj & @@ -5927,7 +5931,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -7634,6 +7638,9 @@ $(OBJS)\monodll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monodll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_simplebook.obj : .AUTODEPEND ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -10102,6 +10109,9 @@ $(OBJS)\monolib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(OBJS)\monolib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_simplebook.obj : .AUTODEPEND ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -16004,6 +16014,9 @@ $(OBJS)\xrcdll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrcdll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_simplebook.obj : .AUTODEPEND ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -16202,6 +16215,9 @@ $(OBJS)\xrclib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp $(OBJS)\xrclib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_simplebook.obj : .AUTODEPEND ..\..\src\xrc\xh_simplebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_core.dsp b/software/scsi2sd-util/wxWidgets/build/msw/wx_core.dsp index 3bee4320..d1277adf 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_core.dsp +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_core.dsp @@ -3524,6 +3524,10 @@ SOURCE=..\..\include\wx\xrc\xh_scwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_simplebook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_sizer.h # End Source File # Begin Source File diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj index 31d36040..f28eec3b 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj @@ -514,6 +514,7 @@ + @@ -650,6 +651,7 @@ + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj.filters b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj.filters index 775cd383..1ecba952 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj.filters +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc10_xrc.vcxproj.filters @@ -154,6 +154,9 @@ Source Files + + Source Files + Source Files @@ -359,6 +362,9 @@ Common Headers + + Common Headers + Common Headers diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11.sln b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11.sln index c12a314d..305b0fea 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11.sln +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11.sln @@ -1,6 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_vc11_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc11_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" + ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc11_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" EndProject @@ -16,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc11_wxsc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc11_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} @@ -74,20 +80,17 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc11_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc11_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc11_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc11_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" @@ -119,6 +122,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.ActiveCfg = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.Build.0 = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.ActiveCfg = Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.Build.0 = Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.Build.0 = DLL Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.ActiveCfg = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.Build.0 = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.ActiveCfg = Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.Build.0 = Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_adv.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_adv.vcxproj index 8e20f15f..f862a619 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_adv.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_adv.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -546,30 +546,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -577,38 +561,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_aui.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_aui.vcxproj index e8f51e9d..be8b0230 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_aui.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_aui.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -505,64 +505,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_base.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_base.vcxproj index d9915f45..fc70eb3a 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_base.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_base.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -627,30 +627,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -662,38 +646,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_core.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_core.vcxproj index 6ab5faac..0b081eea 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_core.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_core.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -1123,30 +1123,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -1200,38 +1184,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj new file mode 100644 index 00000000..2c977b8e --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj @@ -0,0 +1,237 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + DLL Debug + Win32 + + + DLL Debug + x64 + + + DLL Release + Win32 + + + DLL Release + x64 + + + Release + Win32 + + + Release + x64 + + + + _custom_build + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + + + + DynamicLibrary + false + Unicode + v110 + + + DynamicLibrary + false + Unicode + v110 + + + DynamicLibrary + false + Unicode + v110 + + + DynamicLibrary + false + Unicode + v110 + + + StaticLibrary + false + Unicode + v110 + + + StaticLibrary + false + Unicode + v110 + + + Utility + false + Unicode + v110 + + + StaticLibrary + false + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + true + true + true + true + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + false + false + true + true + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + + + + + + + + + + + + + + + + + + + + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + + + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj.filters b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj.filters new file mode 100644 index 00000000..03d7e9b3 --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_custom_build.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {63537534-1833-5C1F-8DBD-359A84F294C8} + + + {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} + + + + + Setup Headers + + + MSW Headers + + + \ No newline at end of file diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_gl.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_gl.vcxproj index ded7f124..ff577655 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_gl.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_gl.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_html.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_html.vcxproj index ad4c5fbd..b9396220 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_html.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_html.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -523,64 +523,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_media.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_media.vcxproj index e0bb2d73..69bbe77a 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_media.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_media.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -501,64 +501,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_net.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_net.vcxproj index 658c9377..e86dfba5 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_net.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_net.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -509,64 +509,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_propgrid.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_propgrid.vcxproj index 7dd75259..1f0dcf35 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_propgrid.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_propgrid.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -505,64 +505,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_qa.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_qa.vcxproj index 8e8f918e..84915262 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_qa.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_qa.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_ribbon.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_ribbon.vcxproj index 446cdaa5..29c88f92 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_ribbon.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_ribbon.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -508,64 +508,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_richtext.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_richtext.vcxproj index bc7702ee..41969577 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_richtext.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_richtext.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -508,64 +508,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_stc.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_stc.vcxproj index 853aa79c..791f1960 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_stc.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_stc.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -500,64 +500,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_webview.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_webview.vcxproj index 100a83b0..05685c57 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_webview.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_webview.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -501,64 +501,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxexpat.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxexpat.vcxproj index c25786d2..e9bc1027 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxexpat.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxexpat.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxjpeg.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxjpeg.vcxproj index 1d7658a6..d9dea6cd 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxjpeg.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxjpeg.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxpng.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxpng.vcxproj index d4cb643e..ea7770f7 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxpng.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxpng.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxregex.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxregex.vcxproj index bc1cda49..440d2202 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxregex.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxregex.vcxproj @@ -266,7 +266,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -404,7 +404,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -431,64 +431,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxscintilla.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxscintilla.vcxproj index 90a258e6..5294438b 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxscintilla.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxscintilla.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -554,64 +554,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxtiff.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxtiff.vcxproj index dc10b064..3023ccae 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxtiff.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxtiff.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxzlib.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxzlib.vcxproj index c31b3b03..c04d2615 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxzlib.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_wxzlib.vcxproj @@ -273,7 +273,7 @@ true Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -411,7 +411,7 @@ true Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xml.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xml.vcxproj index e472e1d9..01e1487e 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xml.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xml.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj index cfb863e1..98109c23 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -529,6 +529,7 @@ + @@ -562,64 +563,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true @@ -665,6 +626,7 @@ + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj.filters b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj.filters index 775cd383..1ecba952 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj.filters +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc11_xrc.vcxproj.filters @@ -154,6 +154,9 @@ Source Files + + Source Files + Source Files @@ -359,6 +362,9 @@ Common Headers + + Common Headers + Common Headers diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12.sln b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12.sln index b67323ec..c856d2fa 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12.sln +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12.sln @@ -1,6 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_vc12_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc12_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" + ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc12_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" EndProject @@ -16,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc12_wxsc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc12_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} @@ -74,20 +80,17 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc12_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc12_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc12_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" ProjectSection(ProjectDependencies) = postProject {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc12_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" @@ -119,6 +122,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.ActiveCfg = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|Win32.Build.0 = Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.ActiveCfg = Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Debug|x64.Build.0 = Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Debug|x64.Build.0 = DLL Debug|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.DLL Release|x64.Build.0 = DLL Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.ActiveCfg = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|Win32.Build.0 = Release|Win32 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.ActiveCfg = Release|x64 + {01F4CE10-2CFB-41A8-B41F-E54337868A1D}.Release|x64.Build.0 = Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_adv.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_adv.vcxproj index be1da4d1..64a3dfdf 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_adv.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_adv.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -546,30 +546,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -577,38 +561,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_aui.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_aui.vcxproj index ee5f243b..c1f20f6c 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_aui.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_aui.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -505,64 +505,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_base.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_base.vcxproj index 9b29912f..fe1b30db 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_base.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_base.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -627,30 +627,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -662,38 +646,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_core.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_core.vcxproj index c840159e..646e302d 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_core.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_core.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -1123,30 +1123,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true @@ -1200,38 +1184,14 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj new file mode 100644 index 00000000..24a81f47 --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj @@ -0,0 +1,237 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + DLL Debug + Win32 + + + DLL Debug + x64 + + + DLL Release + Win32 + + + DLL Release + x64 + + + Release + Win32 + + + Release + x64 + + + + _custom_build + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + + + + DynamicLibrary + false + Unicode + v120 + + + DynamicLibrary + false + Unicode + v120 + + + DynamicLibrary + false + Unicode + v120 + + + DynamicLibrary + false + Unicode + v120 + + + StaticLibrary + false + Unicode + v120 + + + StaticLibrary + false + Unicode + v120 + + + Utility + false + Unicode + v120 + + + StaticLibrary + false + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + true + true + true + true + $(wxOutDir) + $(wxOutDir) + $(wxIntRootDir)$(ProjectName)\ + $(wxIntRootDir)$(ProjectName)\ + false + false + true + true + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitLibNamePrefix)$(ProjectName) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) + + + + + + + + + + + + + + + + + + + + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + Creating $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + + + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj.filters b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj.filters new file mode 100644 index 00000000..03d7e9b3 --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_custom_build.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {63537534-1833-5C1F-8DBD-359A84F294C8} + + + {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} + + + + + Setup Headers + + + MSW Headers + + + \ No newline at end of file diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_gl.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_gl.vcxproj index 3ef1879e..99df176d 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_gl.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_gl.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_html.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_html.vcxproj index 91c2fe3a..d55e118a 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_html.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_html.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -523,64 +523,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_media.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_media.vcxproj index 5b4e846f..07144ecb 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_media.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_media.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -501,64 +501,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_net.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_net.vcxproj index dc878dd7..07e20e50 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_net.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_net.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -509,64 +509,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_propgrid.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_propgrid.vcxproj index dce905d5..bc025139 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_propgrid.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_propgrid.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -505,64 +505,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_qa.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_qa.vcxproj index efb51b75..999725a8 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_qa.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_qa.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_ribbon.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_ribbon.vcxproj index 692a0752..8a9be2dd 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_ribbon.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_ribbon.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -508,64 +508,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_richtext.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_richtext.vcxproj index a29b26cc..e2744c21 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_richtext.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_richtext.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -508,64 +508,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_stc.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_stc.vcxproj index 3c9278a9..dc8eb2a2 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_stc.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_stc.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -500,64 +500,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_webview.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_webview.vcxproj index 3f53a01e..30b69837 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_webview.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_webview.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -501,64 +501,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxexpat.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxexpat.vcxproj index c4e48c9e..5bb6d083 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxexpat.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxexpat.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxjpeg.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxjpeg.vcxproj index e371076c..6fa359c3 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxjpeg.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxjpeg.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxpng.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxpng.vcxproj index 8bef974e..e236f0b7 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxpng.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxpng.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxregex.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxregex.vcxproj index bd80e2bf..e0d398f5 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxregex.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxregex.vcxproj @@ -266,7 +266,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -404,7 +404,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -431,64 +431,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxscintilla.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxscintilla.vcxproj index 62e4d0a2..abccd3fc 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxscintilla.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxscintilla.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -554,64 +554,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxtiff.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxtiff.vcxproj index 55d20128..fce8e463 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxtiff.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxtiff.vcxproj @@ -274,7 +274,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -412,7 +412,7 @@ $(OutDir)$(TargetName).pdb Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxzlib.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxzlib.vcxproj index 3dadf65a..43172fd4 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxzlib.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_wxzlib.vcxproj @@ -273,7 +273,7 @@ true Level3 true - None + ProgramDatabase AnySuitable true Speed @@ -411,7 +411,7 @@ true Level3 true - None + ProgramDatabase AnySuitable true Speed diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xml.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xml.vcxproj index aa289745..eff69f5e 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xml.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xml.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -499,64 +499,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj index a7aff8c3..ea0648b4 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj @@ -284,7 +284,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -450,7 +450,7 @@ $(OutDir)$(TargetName).pdb Level4 true - None + ProgramDatabase AnySuitable true Speed @@ -529,6 +529,7 @@ + @@ -562,64 +563,24 @@ - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) + true + true + true + true + true + true + true + true - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) + true + true + true + true + true + true + true + true @@ -665,6 +626,7 @@ + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj.filters b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj.filters index 775cd383..1ecba952 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj.filters +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc12_xrc.vcxproj.filters @@ -154,6 +154,9 @@ Source Files + + Source Files + Source Files @@ -359,6 +362,9 @@ Common Headers + + Common Headers + Common Headers diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_core.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_core.vcproj index 13d25ff6..05d32c78 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_core.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_core.vcproj @@ -2828,6 +2828,9 @@ + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_xrc.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_xrc.vcproj index 6ea98821..574bd369 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_xrc.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc7_xrc.vcproj @@ -545,6 +545,9 @@ + + @@ -739,6 +742,9 @@ + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8.sln b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8.sln index 6d6329af..c5337121 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8.sln +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8.sln @@ -52,195 +52,383 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.ActiveCfg = Debug|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.Build.0 = Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|x64.ActiveCfg = Debug|x64 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|x64.Build.0 = Debug|x64 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.ActiveCfg = Release|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.Build.0 = Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|x64.ActiveCfg = Release|x64 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|x64.Build.0 = Release|x64 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|x64.Build.0 = DLL Debug|x64 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|x64.Build.0 = DLL Release|x64 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.ActiveCfg = Debug|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.Build.0 = Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|x64.ActiveCfg = Debug|x64 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|x64.Build.0 = Debug|x64 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.ActiveCfg = Release|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.Build.0 = Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|x64.ActiveCfg = Release|x64 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|x64.Build.0 = Release|x64 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|x64.Build.0 = DLL Debug|x64 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|x64.Build.0 = DLL Release|x64 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.ActiveCfg = Debug|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.Build.0 = Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|x64.ActiveCfg = Debug|x64 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|x64.Build.0 = Debug|x64 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.ActiveCfg = Release|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.Build.0 = Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|x64.ActiveCfg = Release|x64 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|x64.Build.0 = Release|x64 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|x64.Build.0 = DLL Debug|x64 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|x64.Build.0 = DLL Release|x64 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.ActiveCfg = Debug|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.Build.0 = Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|x64.ActiveCfg = Debug|x64 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|x64.Build.0 = Debug|x64 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.ActiveCfg = Release|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.Build.0 = Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|x64.ActiveCfg = Release|x64 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|x64.Build.0 = Release|x64 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|x64.Build.0 = DLL Release|x64 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.ActiveCfg = Debug|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.Build.0 = Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|x64.ActiveCfg = Debug|x64 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|x64.Build.0 = Debug|x64 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.ActiveCfg = Release|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.Build.0 = Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|x64.ActiveCfg = Release|x64 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|x64.Build.0 = Release|x64 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|x64.Build.0 = DLL Release|x64 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.ActiveCfg = Debug|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.Build.0 = Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|x64.ActiveCfg = Debug|x64 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|x64.Build.0 = Debug|x64 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.ActiveCfg = Release|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.Build.0 = Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|x64.ActiveCfg = Release|x64 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|x64.Build.0 = Release|x64 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|x64.Build.0 = DLL Release|x64 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.ActiveCfg = Debug|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.Build.0 = Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|x64.ActiveCfg = Debug|x64 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|x64.Build.0 = Debug|x64 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.ActiveCfg = Release|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.Build.0 = Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|x64.ActiveCfg = Release|x64 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|x64.Build.0 = Release|x64 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|x64.Build.0 = DLL Debug|x64 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|x64.Build.0 = DLL Release|x64 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.ActiveCfg = Debug|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.Build.0 = Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|x64.ActiveCfg = Debug|x64 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|x64.Build.0 = Debug|x64 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.ActiveCfg = Release|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.Build.0 = Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|x64.ActiveCfg = Release|x64 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|x64.Build.0 = Release|x64 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|x64.Build.0 = DLL Debug|x64 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|x64.Build.0 = DLL Release|x64 {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.ActiveCfg = Debug|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.Build.0 = Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|x64.ActiveCfg = Debug|x64 + {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|x64.Build.0 = Debug|x64 {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.ActiveCfg = Release|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.Build.0 = Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Release|x64.ActiveCfg = Release|x64 + {C752F044-0E49-5C21-818F-751B327B35AA}.Release|x64.Build.0 = Release|x64 {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|x64.Build.0 = DLL Debug|x64 {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|x64.Build.0 = DLL Release|x64 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.ActiveCfg = Debug|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.Build.0 = Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|x64.ActiveCfg = Debug|x64 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|x64.Build.0 = Debug|x64 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.ActiveCfg = Release|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.Build.0 = Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|x64.ActiveCfg = Release|x64 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|x64.Build.0 = Release|x64 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|x64.Build.0 = DLL Release|x64 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.ActiveCfg = Debug|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.Build.0 = Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|x64.ActiveCfg = Debug|x64 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|x64.Build.0 = Debug|x64 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.ActiveCfg = Release|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.Build.0 = Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|x64.ActiveCfg = Release|x64 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|x64.Build.0 = Release|x64 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|x64.Build.0 = DLL Debug|x64 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|x64.Build.0 = DLL Release|x64 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.Build.0 = Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|x64.ActiveCfg = Debug|x64 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|x64.Build.0 = Debug|x64 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.ActiveCfg = Release|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.Build.0 = Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|x64.ActiveCfg = Release|x64 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|x64.Build.0 = Release|x64 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|x64.Build.0 = DLL Release|x64 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.ActiveCfg = Debug|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.Build.0 = Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|x64.ActiveCfg = Debug|x64 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|x64.Build.0 = Debug|x64 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.ActiveCfg = Release|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.Build.0 = Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|x64.ActiveCfg = Release|x64 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|x64.Build.0 = Release|x64 {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|x64.Build.0 = DLL Debug|x64 {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|x64.Build.0 = DLL Release|x64 {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|Win32.ActiveCfg = Debug|Win32 {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|Win32.Build.0 = Debug|Win32 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|x64.ActiveCfg = Debug|x64 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|x64.Build.0 = Debug|x64 {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|Win32.ActiveCfg = Release|Win32 {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|Win32.Build.0 = Release|Win32 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|x64.ActiveCfg = Release|x64 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|x64.Build.0 = Release|x64 {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|x64.Build.0 = DLL Debug|x64 {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|x64.Build.0 = DLL Release|x64 {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.ActiveCfg = Debug|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.Build.0 = Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|x64.ActiveCfg = Debug|x64 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|x64.Build.0 = Debug|x64 {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.ActiveCfg = Release|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.Build.0 = Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|x64.ActiveCfg = Release|x64 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|x64.Build.0 = Release|x64 {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|x64.Build.0 = DLL Release|x64 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.ActiveCfg = Debug|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.Build.0 = Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|x64.ActiveCfg = Debug|x64 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|x64.Build.0 = Debug|x64 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.ActiveCfg = Release|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.Build.0 = Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|x64.ActiveCfg = Release|x64 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|x64.Build.0 = Release|x64 {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|x64.Build.0 = DLL Debug|x64 {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|x64.Build.0 = DLL Release|x64 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.ActiveCfg = Debug|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.Build.0 = Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|x64.ActiveCfg = Debug|x64 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|x64.Build.0 = Debug|x64 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.ActiveCfg = Release|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.Build.0 = Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|x64.ActiveCfg = Release|x64 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|x64.Build.0 = Release|x64 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|x64.Build.0 = DLL Debug|x64 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|x64.Build.0 = DLL Release|x64 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.ActiveCfg = Debug|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.Build.0 = Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|x64.ActiveCfg = Debug|x64 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|x64.Build.0 = Debug|x64 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.ActiveCfg = Release|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.Build.0 = Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|x64.ActiveCfg = Release|x64 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|x64.Build.0 = Release|x64 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|x64.Build.0 = DLL Debug|x64 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|x64.Build.0 = DLL Release|x64 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|x64.ActiveCfg = Debug|x64 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|x64.Build.0 = Debug|x64 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|x64.ActiveCfg = Release|x64 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|x64.Build.0 = Release|x64 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|x64.Build.0 = DLL Debug|x64 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|x64.Build.0 = DLL Release|x64 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|x64.ActiveCfg = Debug|x64 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|x64.Build.0 = Debug|x64 {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.Build.0 = Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|x64.ActiveCfg = Release|x64 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|x64.Build.0 = Release|x64 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|x64.Build.0 = DLL Debug|x64 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|x64.Build.0 = DLL Release|x64 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.Build.0 = Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|x64.ActiveCfg = Debug|x64 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|x64.Build.0 = Debug|x64 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.ActiveCfg = Release|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.Build.0 = Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|x64.ActiveCfg = Release|x64 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|x64.Build.0 = Release|x64 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|x64.Build.0 = DLL Debug|x64 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|x64.Build.0 = DLL Release|x64 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.ActiveCfg = Debug|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.Build.0 = Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|x64.ActiveCfg = Debug|x64 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|x64.Build.0 = Debug|x64 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.ActiveCfg = Release|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.Build.0 = Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|x64.ActiveCfg = Release|x64 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|x64.Build.0 = Release|x64 {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|x64.Build.0 = DLL Debug|x64 {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|x64.Build.0 = DLL Release|x64 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.ActiveCfg = Debug|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.Build.0 = Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|x64.ActiveCfg = Debug|x64 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|x64.Build.0 = Debug|x64 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.ActiveCfg = Release|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.Build.0 = Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|x64.ActiveCfg = Release|x64 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|x64.Build.0 = Release|x64 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|x64.Build.0 = DLL Debug|x64 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_adv.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_adv.vcproj index b51791c9..68ea442b 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_adv.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_adv.vcproj @@ -16,6 +16,9 @@ + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -435,6 +792,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -479,6 +836,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -575,6 +932,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_gl.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_gl.vcproj index ee58f512..7133da8f 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_gl.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_gl.vcproj @@ -16,6 +16,9 @@ + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -423,6 +780,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,6 +342,324 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxjpeg.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxjpeg.vcproj index 7a6da1f9..ec1b08fd 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxjpeg.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxjpeg.vcproj @@ -16,6 +16,9 @@ + @@ -339,6 +342,324 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxpng.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxpng.vcproj index fda814ab..a4b92e69 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxpng.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxpng.vcproj @@ -16,6 +16,9 @@ + @@ -339,6 +342,324 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxregex.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxregex.vcproj index aa800b16..8e55df91 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxregex.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxregex.vcproj @@ -16,6 +16,9 @@ + @@ -343,6 +346,328 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -422,6 +747,50 @@ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxscintilla.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxscintilla.vcproj index bc41f44b..27c0f9f6 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxscintilla.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxscintilla.vcproj @@ -16,6 +16,9 @@ + @@ -343,6 +346,328 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -882,6 +1207,50 @@ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxtiff.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxtiff.vcproj index aa1c26fa..e96839de 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxtiff.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxtiff.vcproj @@ -16,6 +16,9 @@ + @@ -339,6 +342,324 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxzlib.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxzlib.vcproj index d4c2752c..e72e9927 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxzlib.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_wxzlib.vcproj @@ -16,6 +16,9 @@ + @@ -339,6 +342,324 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_xml.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_xml.vcproj index cd752220..d0a33568 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_xml.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc8_xml.vcproj @@ -16,6 +16,9 @@ + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -375,6 +378,360 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -994,6 +1491,10 @@ RelativePath="..\..\src\xrc\xh_scwin.cpp" > + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9.sln b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9.sln index 251e2fdd..56f929fe 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9.sln +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9.sln @@ -52,195 +52,383 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_adv.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_adv.vcproj index 3f531ad7..6b13c7e2 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_adv.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_adv.vcproj @@ -16,6 +16,9 @@ + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -433,6 +788,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -477,6 +832,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -573,6 +928,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_gl.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_gl.vcproj index ee90427d..5d2fda79 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_gl.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_gl.vcproj @@ -16,6 +16,9 @@ + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -421,6 +776,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -337,6 +340,322 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxjpeg.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxjpeg.vcproj index 14bb26c0..2ca2583c 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxjpeg.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxjpeg.vcproj @@ -16,6 +16,9 @@ + @@ -337,6 +340,322 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxpng.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxpng.vcproj index 5b5b2ee4..f8eaadd4 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxpng.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxpng.vcproj @@ -16,6 +16,9 @@ + @@ -337,6 +340,322 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxregex.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxregex.vcproj index 91517232..79890f18 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxregex.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxregex.vcproj @@ -16,6 +16,9 @@ + @@ -341,6 +344,326 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -420,6 +743,50 @@ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxscintilla.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxscintilla.vcproj index df4f7f90..d99951ea 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxscintilla.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxscintilla.vcproj @@ -16,6 +16,9 @@ + @@ -341,6 +344,326 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -880,6 +1203,50 @@ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxtiff.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxtiff.vcproj index cc954eb3..6b1ce908 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxtiff.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxtiff.vcproj @@ -16,6 +16,9 @@ + @@ -337,6 +340,322 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxzlib.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxzlib.vcproj index b4636b52..054ccb4b 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxzlib.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_wxzlib.vcproj @@ -16,6 +16,9 @@ + @@ -337,6 +340,322 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_xml.vcproj b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_xml.vcproj index 61caa45d..b4088030 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_xml.vcproj +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_vc9_xml.vcproj @@ -16,6 +16,9 @@ + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,6 +376,358 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -417,6 +772,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -992,6 +1487,10 @@ RelativePath="..\..\src\xrc\xh_scwin.cpp" > + + diff --git a/software/scsi2sd-util/wxWidgets/build/msw/wx_xrc.dsp b/software/scsi2sd-util/wxWidgets/build/msw/wx_xrc.dsp index 8068b2ed..8c2b124f 100644 --- a/software/scsi2sd-util/wxWidgets/build/msw/wx_xrc.dsp +++ b/software/scsi2sd-util/wxWidgets/build/msw/wx_xrc.dsp @@ -484,6 +484,10 @@ SOURCE=..\..\include\wx\xrc\xh_scwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_simplebook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_sizer.h # End Source File # Begin Source File @@ -740,6 +744,10 @@ SOURCE=..\..\src\xrc\xh_scwin.cpp # End Source File # Begin Source File +SOURCE=..\..\src\xrc\xh_simplebook.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_sizer.cpp # End Source File # Begin Source File diff --git a/software/scsi2sd-util/wxWidgets/build/osx/makeprojects.applescript b/software/scsi2sd-util/wxWidgets/build/osx/makeprojects.applescript index 0f6fe076..551d5d29 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/makeprojects.applescript +++ b/software/scsi2sd-util/wxWidgets/build/osx/makeprojects.applescript @@ -216,7 +216,7 @@ end makeProject init() set theProject to {projectName:"", conditions:{}, bklfiles:{ - "../bakefiles/files.bkl", "../bakefiles/regex.bkl", "../bakefiles/tiff.bkl", "../bakefiles/png.bkl", "../bakefiles/jpeg.bkl", "../bakefiles/scintilla.bkl", "../bakefiles/expat.bkl"}, nodes:{ + "../bakefiles/files.bkl", "../bakefiles/zlib.bkl", "../bakefiles/regex.bkl", "../bakefiles/tiff.bkl", "../bakefiles/png.bkl", "../bakefiles/jpeg.bkl", "../bakefiles/scintilla.bkl", "../bakefiles/expat.bkl"}, nodes:{ {label:"base", entries:{"$(BASE_SRC)"}},  {label:"base", entries:{"$(BASE_AND_GUI_SRC)"}},  {label:"core", entries:{"$(CORE_SRC)"}},  @@ -233,6 +233,7 @@ set theProject to {projectName:"", conditions:{}, bklfiles:{ {label:"propgrid", entries:{"$(PROPGRID_SRC)"}},  {label:"richtext", entries:{"$(RICHTEXT_SRC)"}},  {label:"stc", entries:{"$(STC_SRC)"}},  + {label:"libzlib", entries:{"$(wxzlib)"}},  {label:"libtiff", entries:{"$(wxtiff)"}},  {label:"libjpeg", entries:{"$(wxjpeg)"}},  {label:"libpng", entries:{"$(wxpng)"}},  diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wx.xcconfig b/software/scsi2sd-util/wxWidgets/build/osx/wx.xcconfig index 81bbcaf4..3a3822f7 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wx.xcconfig +++ b/software/scsi2sd-util/wxWidgets/build/osx/wx.xcconfig @@ -11,7 +11,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h GCC_PRECOMPILE_PREFIX_HEADER = YES HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" -USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" +USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" ALWAYS_SEARCH_USER_PATHS = NO GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) WXBUILDING $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++ diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon.xcodeproj/project.pbxproj index ec2f62b6..fc562ea7 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon.xcodeproj/project.pbxproj @@ -119,6 +119,8 @@ 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; + 0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; @@ -133,6 +135,8 @@ 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; }; + 10743B74A58231639C6BF611 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; }; 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; 11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; @@ -209,6 +213,8 @@ 1C544DADDA6F3D62A5E25E94 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; }; 1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; }; 1CBF34ACA39330028A5EA9AD /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; }; + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; }; + 1CC5AEC6C08E3600801CDADB /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; }; 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; @@ -245,6 +251,8 @@ 20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; }; + 213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; }; 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; 221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; @@ -407,6 +415,8 @@ 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; }; + 3813146434693234965C4F32 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; }; 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; 3902517F9ED03648B5A4B96A /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */; }; @@ -457,12 +467,16 @@ 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; 41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; }; + 42260A6F1853361083803B0D /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; }; 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; }; + 42AC484FDD7D3E948CEA801D /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; }; 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; @@ -515,6 +529,8 @@ 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; }; + 4B996B4C54163D7091427DB6 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; }; 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; @@ -533,6 +549,8 @@ 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; }; + 4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; }; 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; 50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; @@ -603,6 +621,8 @@ 5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; 5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; }; 5C5D0983160A36189A770743 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; }; + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; }; + 5EE94793DFCB3BA281A4864F /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; }; 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; @@ -899,6 +919,8 @@ 8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; 8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; + 8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; 8E220BCD39B336A495E775BD /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; }; 8E220BCD39B336A495E775BE /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; }; 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; @@ -1003,6 +1025,8 @@ 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; }; + 9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; }; 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; 9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; }; @@ -1051,6 +1075,8 @@ A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; }; + A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; }; A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; @@ -1095,6 +1121,8 @@ AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; }; + AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; }; AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; }; AC0B0C52922B30188AE95E95 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; }; AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; @@ -1201,6 +1229,8 @@ BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; }; + BE3ED6EF34303867B8C8E924 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; }; BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; @@ -1595,6 +1625,8 @@ F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; }; + F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; }; F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; @@ -1710,6 +1742,7 @@ 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = ""; }; 0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = ""; }; + 0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = ""; }; 0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = ""; }; 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; @@ -1761,6 +1794,7 @@ 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = ""; }; 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = ""; }; 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; @@ -1852,6 +1886,7 @@ 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = ""; }; 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = ""; }; 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; @@ -1862,6 +1897,7 @@ 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = ""; }; 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = ""; }; 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; @@ -1900,6 +1936,7 @@ 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = ""; }; 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = ""; }; 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; 4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = ""; }; @@ -1909,6 +1946,7 @@ 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = ""; }; 51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = ""; }; + 513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = ""; }; 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = ""; }; 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; 5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = ""; }; @@ -2022,6 +2060,7 @@ 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = ""; }; + 7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = ""; }; 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; 7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = ""; }; 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; @@ -2036,6 +2075,7 @@ 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = ""; }; 741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = ""; }; 75278C04709D3482A2660DFC /* slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider.cpp; path = ../../src/osx/carbon/slider.cpp; sourceTree = ""; }; 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; @@ -2053,6 +2093,7 @@ 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; 7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = ""; }; + 7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = ""; }; 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = ""; }; @@ -2139,6 +2180,7 @@ 950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = ""; }; 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; 95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd.cpp; path = ../../src/osx/carbon/nonownedwnd.cpp; sourceTree = ""; }; + 95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = ""; }; 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; @@ -2148,6 +2190,7 @@ 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; 975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = ""; }; 9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = ""; }; + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = ""; }; 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton.cpp; path = ../../src/osx/carbon/anybutton.cpp; sourceTree = ""; }; @@ -2164,6 +2207,7 @@ 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = ""; }; 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = ""; }; 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; @@ -2255,6 +2299,7 @@ B44B32437825326C84607AD8 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcarbon.xcconfig; sourceTree = ""; }; B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = ""; }; B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; @@ -2278,6 +2323,7 @@ B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; BACF6FE87AD337729BBB72BD /* taskbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskbar.cpp; path = ../../src/osx/carbon/taskbar.cpp; sourceTree = ""; }; + BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = ""; }; BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; @@ -2371,6 +2417,7 @@ D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = ""; }; D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = ""; }; D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; @@ -2502,6 +2549,7 @@ FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = ""; }; FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = ""; }; @@ -2663,6 +2711,7 @@ B8F95052522B37AB86DA8917 /* propgrid */, 64B126D857113F24BA8C4758 /* richtext */, E96566B813153B4295AD767B /* stc */, + 52DDFBAA5ACC394FB6B30E74 /* libzlib */, EB288BE7E74B3328B762A461 /* libtiff */, 7650A73F7FC9305EA62DAE86 /* libjpeg */, 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, @@ -2789,6 +2838,7 @@ 66411D54BAD338498AC59401 /* xh_scrol.cpp */, E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */, 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, 950D51915EF83B57B5E8306F /* xh_spin.cpp */, @@ -2894,6 +2944,14 @@ name = src/richtext; sourceTree = ""; }; + 52DDFBAA5ACC394FB6B30E74 /* libzlib */ = { + isa = PBXGroup; + children = ( + A7471B15D7093D38B8649962 /* src/zlib */, + ); + name = libzlib; + sourceTree = ""; + }; 5C5CD199E7573C73AE6F392D /* media */ = { isa = PBXGroup; children = ( @@ -3284,6 +3342,28 @@ name = src/tiff/libtiff; sourceTree = ""; }; + A7471B15D7093D38B8649962 /* src/zlib */ = { + isa = PBXGroup; + children = ( + 0E45F6DF601A34BCB3CC0206 /* adler32.c */, + D4C4495603293C07A3B09D54 /* compress.c */, + 7013DB195D023C31ADE68546 /* crc32.c */, + 3CF73F49AEC238C99CE89845 /* deflate.c */, + 7A24E9101688368296C21EBE /* gzclose.c */, + 7395814D42CC38F6B8CD81B4 /* gzlib.c */, + BAD4614CABC934D6AFF8D9CD /* gzread.c */, + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */, + FDB0E2D0966C3E408C4A2D3D /* infback.c */, + 400275BE019D3E5BA47988BE /* inffast.c */, + B5370A676AAC32419D7FDD87 /* inflate.c */, + 9D6B0D32537D35069C7E053F /* inftrees.c */, + 95B4EDF38F8A3E5EBAFF560F /* trees.c */, + 513033E36E643593AC305B3D /* uncompr.c */, + 4CB467F9898C3952A68D988B /* zutil.c */, + ); + name = src/zlib; + sourceTree = ""; + }; AC04244D4E183DF480908046 /* src/osx/core */ = { isa = PBXGroup; children = ( @@ -4592,6 +4672,7 @@ FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */, 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */, 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */, + A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */, E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */, 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */, C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */, @@ -4660,6 +4741,21 @@ E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */, 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */, 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */, + F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */, + BE3ED6EF34303867B8C8E924 /* compress.c in Sources */, + AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */, + 8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */, + 213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */, + 0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */, + 4B996B4C54163D7091427DB6 /* gzread.c in Sources */, + 4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */, + 5EE94793DFCB3BA281A4864F /* infback.c in Sources */, + 10743B74A58231639C6BF611 /* inffast.c in Sources */, + 42AC484FDD7D3E948CEA801D /* inflate.c in Sources */, + 3813146434693234965C4F32 /* inftrees.c in Sources */, + 1CC5AEC6C08E3600801CDADB /* trees.c in Sources */, + 9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */, + 42260A6F1853361083803B0D /* zutil.c in Sources */, 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */, 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */, 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */, @@ -5430,6 +5526,7 @@ FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */, E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, @@ -5498,6 +5595,21 @@ E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */, + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */, + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */, + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */, + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */, + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */, + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */, + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */, + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */, + 10743B74A58231639C6BF610 /* inffast.c in Sources */, + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */, + 3813146434693234965C4F31 /* inftrees.c in Sources */, + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */, + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */, + 42260A6F1853361083803B0C /* zutil.c in Sources */, 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, @@ -5736,10 +5848,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Debug; }; @@ -5765,10 +5874,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Release; }; diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon_in.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon_in.xcodeproj/project.pbxproj index 8a8811c9..1cc9e57e 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon_in.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxcarbon_in.xcodeproj/project.pbxproj @@ -187,10 +187,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Debug; }; @@ -200,10 +197,7 @@ buildSettings = { EXECUTABLE_PREFIX = lib; INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Release; }; diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa.xcodeproj/project.pbxproj index cc013c04..fd201b77 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -119,6 +119,8 @@ 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; + 0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; @@ -133,6 +135,8 @@ 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; }; + 10743B74A58231639C6BF611 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; }; 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; 11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; @@ -209,6 +213,8 @@ 1C544DADDA6F3D62A5E25E94 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; }; 1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; }; 1CBF34ACA39330028A5EA9AD /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; }; + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; }; + 1CC5AEC6C08E3600801CDADB /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; }; 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; @@ -249,6 +255,8 @@ 20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; }; + 213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; }; 219304C9DDA33E9AADB515DC /* datetimectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */; }; 219304C9DDA33E9AADB515DD /* datetimectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */; }; 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; }; @@ -421,6 +429,8 @@ 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; }; + 3813146434693234965C4F32 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; }; 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; 39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; @@ -467,12 +477,16 @@ 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; 41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; }; + 42260A6F1853361083803B0D /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; }; 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; }; + 42AC484FDD7D3E948CEA801D /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; }; 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; @@ -525,6 +539,8 @@ 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; }; + 4B996B4C54163D7091427DB6 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; }; 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; @@ -543,6 +559,8 @@ 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; }; + 4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; }; 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; 4F99EB97F65330C28EB4D077 /* datectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */; }; @@ -621,6 +639,8 @@ 5C5D0983160A36189A770743 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; }; 5DA146A9F7653F53BF5299E8 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; }; 5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; }; + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; }; + 5EE94793DFCB3BA281A4864F /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; }; 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; @@ -925,6 +945,8 @@ 8C2B50E3FC7A37C58CC9DC0B /* colour.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */; }; 8C52B1985BAA371FA22CCEBB /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; }; 8C52B1985BAA371FA22CCEBC /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; }; + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; + 8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; 8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; 8EE5A2467401365C8217AF2F /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 835C22B71A0F3C469310E1E0 /* preferences.mm */; }; @@ -1021,6 +1043,8 @@ 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; }; + 9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; }; 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; 9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; }; @@ -1071,6 +1095,8 @@ A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; }; + A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; }; A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; @@ -1115,6 +1141,8 @@ AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; }; + AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; }; AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; }; AC0B0C52922B30188AE95E95 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; }; AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; @@ -1221,6 +1249,8 @@ BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; }; + BE3ED6EF34303867B8C8E924 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; }; BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; @@ -1597,6 +1627,8 @@ F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; }; + F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; }; F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; @@ -1714,6 +1746,7 @@ 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = ""; }; 0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = ""; }; + 0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = ""; }; 0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = ""; }; 0E8036758CEC3296B555E4DF /* notebook.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = notebook.mm; path = ../../src/osx/cocoa/notebook.mm; sourceTree = ""; }; 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; @@ -1767,6 +1800,7 @@ 1D799486AD7F336BB1F33DDC /* menu.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = menu.mm; path = ../../src/osx/cocoa/menu.mm; sourceTree = ""; }; 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = ""; }; 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; @@ -1862,6 +1896,7 @@ 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = spinbutt.mm; path = ../../src/osx/cocoa/spinbutt.mm; sourceTree = ""; }; 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = ""; }; 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; @@ -1872,6 +1907,7 @@ 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = ""; }; 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = ""; }; 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; @@ -1908,6 +1944,7 @@ 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = ""; }; 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = ""; }; 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; 4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = ""; }; @@ -1917,6 +1954,7 @@ 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = ""; }; 51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = ""; }; + 513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = ""; }; 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = ""; }; 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; 5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = ""; }; @@ -2032,6 +2070,7 @@ 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = ""; }; + 7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = ""; }; 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; 7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = ""; }; 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; @@ -2045,6 +2084,7 @@ 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = ""; }; 741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = ""; }; 743EF8DB16CE371DA5C66623 /* statline.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = statline.mm; path = ../../src/osx/cocoa/statline.mm; sourceTree = ""; }; 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; @@ -2063,6 +2103,7 @@ 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; 7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = ""; }; + 7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = ""; }; 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = ""; }; @@ -2153,6 +2194,7 @@ 95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/cocoa/stattext.mm; sourceTree = ""; }; 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; 95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectrl_osx.cpp; path = ../../src/osx/datectrl_osx.cpp; sourceTree = ""; }; + 95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = ""; }; 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; @@ -2162,6 +2204,7 @@ 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; 975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = ""; }; 9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = ""; }; + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = ""; }; 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; 98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/cocoa/gauge.mm; sourceTree = ""; }; @@ -2180,6 +2223,7 @@ 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = ""; }; 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = ""; }; 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; @@ -2268,6 +2312,7 @@ B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appunix.cpp; path = ../../src/unix/appunix.cpp; sourceTree = ""; }; B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = ""; }; B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; @@ -2289,6 +2334,7 @@ B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/lexers/LexD.cxx; sourceTree = ""; }; B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; + BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = ""; }; BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; @@ -2382,6 +2428,7 @@ D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = ""; }; D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = ""; }; D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; @@ -2508,6 +2555,7 @@ FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = ""; }; FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = ""; }; @@ -2606,6 +2654,7 @@ B8F95052522B37AB86DA8917 /* propgrid */, 64B126D857113F24BA8C4758 /* richtext */, E96566B813153B4295AD767B /* stc */, + 52DDFBAA5ACC394FB6B30E74 /* libzlib */, EB288BE7E74B3328B762A461 /* libtiff */, 7650A73F7FC9305EA62DAE86 /* libjpeg */, 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, @@ -2734,6 +2783,7 @@ 66411D54BAD338498AC59401 /* xh_scrol.cpp */, E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */, 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, 950D51915EF83B57B5E8306F /* xh_spin.cpp */, @@ -2839,6 +2889,14 @@ name = src/richtext; sourceTree = ""; }; + 52DDFBAA5ACC394FB6B30E74 /* libzlib */ = { + isa = PBXGroup; + children = ( + A7471B15D7093D38B8649962 /* src/zlib */, + ); + name = libzlib; + sourceTree = ""; + }; 5C5CD199E7573C73AE6F392D /* media */ = { isa = PBXGroup; children = ( @@ -3229,6 +3287,28 @@ name = src/tiff/libtiff; sourceTree = ""; }; + A7471B15D7093D38B8649962 /* src/zlib */ = { + isa = PBXGroup; + children = ( + 0E45F6DF601A34BCB3CC0206 /* adler32.c */, + D4C4495603293C07A3B09D54 /* compress.c */, + 7013DB195D023C31ADE68546 /* crc32.c */, + 3CF73F49AEC238C99CE89845 /* deflate.c */, + 7A24E9101688368296C21EBE /* gzclose.c */, + 7395814D42CC38F6B8CD81B4 /* gzlib.c */, + BAD4614CABC934D6AFF8D9CD /* gzread.c */, + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */, + FDB0E2D0966C3E408C4A2D3D /* infback.c */, + 400275BE019D3E5BA47988BE /* inffast.c */, + B5370A676AAC32419D7FDD87 /* inflate.c */, + 9D6B0D32537D35069C7E053F /* inftrees.c */, + 95B4EDF38F8A3E5EBAFF560F /* trees.c */, + 513033E36E643593AC305B3D /* uncompr.c */, + 4CB467F9898C3952A68D988B /* zutil.c */, + ); + name = src/zlib; + sourceTree = ""; + }; AC04244D4E183DF480908046 /* src/osx/core */ = { isa = PBXGroup; children = ( @@ -4618,6 +4698,7 @@ FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */, 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */, 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */, + A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */, E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */, 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */, C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */, @@ -4686,6 +4767,21 @@ E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */, 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */, 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */, + F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */, + BE3ED6EF34303867B8C8E924 /* compress.c in Sources */, + AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */, + 8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */, + 213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */, + 0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */, + 4B996B4C54163D7091427DB6 /* gzread.c in Sources */, + 4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */, + 5EE94793DFCB3BA281A4864F /* infback.c in Sources */, + 10743B74A58231639C6BF611 /* inffast.c in Sources */, + 42AC484FDD7D3E948CEA801D /* inflate.c in Sources */, + 3813146434693234965C4F32 /* inftrees.c in Sources */, + 1CC5AEC6C08E3600801CDADB /* trees.c in Sources */, + 9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */, + 42260A6F1853361083803B0D /* zutil.c in Sources */, 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */, 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */, 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */, @@ -5458,6 +5554,7 @@ FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */, E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, @@ -5526,6 +5623,21 @@ E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */, + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */, + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */, + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */, + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */, + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */, + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */, + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */, + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */, + 10743B74A58231639C6BF610 /* inffast.c in Sources */, + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */, + 3813146434693234965C4F31 /* inftrees.c in Sources */, + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */, + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */, + 42260A6F1853361083803B0C /* zutil.c in Sources */, 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, @@ -5768,10 +5880,7 @@ WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Debug; }; @@ -5801,10 +5910,7 @@ WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Release; }; diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa_in.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa_in.xcodeproj/project.pbxproj index 79c5e045..14c2973d 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa_in.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxcocoa_in.xcodeproj/project.pbxproj @@ -191,10 +191,7 @@ WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Debug; }; @@ -208,10 +205,7 @@ WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; }; name = Release; }; diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxiphone.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/build/osx/wxiphone.xcodeproj/project.pbxproj index f63ead74..d84ce6ff 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxiphone.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxiphone.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 048986FB629E313EA670CD0C /* webviewfshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */; }; 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; 056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; @@ -61,6 +62,7 @@ 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; }; 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; @@ -68,6 +70,7 @@ 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; }; 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; @@ -104,6 +107,7 @@ 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; 1C544DADDA6F3D62A5E25E93 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; }; 1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; }; + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; }; 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; @@ -122,6 +126,7 @@ 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; 20F10669703137E68318C6FD /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; }; 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; }; 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; @@ -160,6 +165,7 @@ 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2DBF5F96CCC63F7481C26A43 /* webview_webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5FEECFD764E037288CE94FEB /* webview_webkit.mm */; }; 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; 2E059BFE8E3B3D9299D55969 /* textmeasure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B31409EC6532FC83B0B957 /* textmeasure.cpp */; }; 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; @@ -200,6 +206,7 @@ 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; }; 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; 39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; @@ -223,9 +230,11 @@ 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; }; 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; }; 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; @@ -252,6 +261,7 @@ 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; }; 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; @@ -261,6 +271,7 @@ 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; }; 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; 50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; @@ -295,6 +306,8 @@ 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; }; + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; }; 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; @@ -314,6 +327,7 @@ 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 64A716F87A5136F9A790EC5A /* webview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DA80913C0E33144A42BD30F /* webview.cpp */; }; 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; @@ -440,6 +454,7 @@ 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; }; 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; 8F98C20E7B223FF4B352C130 /* Catalogue.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 975E3B6A269434F0A069987D /* Catalogue.cxx */; }; 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; @@ -487,6 +502,7 @@ 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; }; 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; 9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; }; 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; @@ -512,6 +528,7 @@ A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; }; A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; @@ -534,6 +551,7 @@ AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; }; AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; }; AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; @@ -585,6 +603,7 @@ BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; }; BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; @@ -769,6 +788,7 @@ F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; }; F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; @@ -846,6 +866,8 @@ 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerunx.cpp; path = ../../src/unix/timerunx.cpp; sourceTree = ""; }; 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = ""; }; + 0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = ""; }; + 0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = ""; }; 0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = ""; }; 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; @@ -894,6 +916,7 @@ 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = ""; }; 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = ""; }; 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; @@ -984,6 +1007,7 @@ 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = ""; }; 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = ""; }; 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; @@ -994,6 +1018,7 @@ 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = ""; }; 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = ""; }; 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; @@ -1030,6 +1055,7 @@ 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = ""; }; 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = ""; }; 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; 4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = ""; }; @@ -1039,6 +1065,7 @@ 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = ""; }; 51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = ""; }; + 513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = ""; }; 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = ""; }; 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; 5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = ""; }; @@ -1101,6 +1128,7 @@ 5F84098A475939BB9EE87E70 /* imagbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagbmp.cpp; path = ../../src/common/imagbmp.cpp; sourceTree = ""; }; 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_comboctrl.cpp; path = ../../src/xrc/xh_comboctrl.cpp; sourceTree = ""; }; 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/stc/scintilla/lexers/LexOpal.cxx; sourceTree = ""; }; + 5FEECFD764E037288CE94FEB /* webview_webkit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = webview_webkit.mm; path = ../../src/osx/webview_webkit.mm; sourceTree = ""; }; 5FF661188B563D27A11F5716 /* fontutil.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutil.cpp; path = ../../src/osx/fontutil.cpp; sourceTree = ""; }; 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut_osx.cpp; path = ../../src/osx/radiobut_osx.cpp; sourceTree = ""; }; 5FFCF47A161B3E08B19BFE14 /* jdsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../../src/jpeg/jdsample.c; sourceTree = ""; }; @@ -1145,6 +1173,8 @@ 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sizer.cpp; path = ../../src/xrc/xh_sizer.cpp; sourceTree = ""; }; 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; + 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = ""; }; + 7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = ""; }; 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; 7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = ""; }; 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; @@ -1158,6 +1188,7 @@ 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = ""; }; 741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = ""; }; 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = ""; }; @@ -1175,6 +1206,7 @@ 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; 7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = ""; }; + 7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = ""; }; 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = ""; }; @@ -1260,6 +1292,7 @@ 950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = ""; }; 95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/iphone/stattext.mm; sourceTree = ""; }; 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; + 95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = ""; }; 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; @@ -1269,6 +1302,7 @@ 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; 975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = ""; }; 9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = ""; }; + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = ""; }; 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; 98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/iphone/gauge.mm; sourceTree = ""; }; @@ -1286,6 +1320,7 @@ 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = ""; }; 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = ""; }; 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; @@ -1373,6 +1408,7 @@ B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_iphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = ""; }; B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; @@ -1394,6 +1430,7 @@ B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/lexers/LexD.cxx; sourceTree = ""; }; B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; + BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = ""; }; BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; @@ -1466,6 +1503,7 @@ CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = ""; }; CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexerSimple.cxx; path = ../../src/stc/scintilla/lexlib/LexerSimple.cxx; sourceTree = ""; }; CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = ""; }; + CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewfshandler.cpp; path = ../../src/common/webviewfshandler.cpp; sourceTree = ""; }; D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = ""; }; D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = ""; }; D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = ""; }; @@ -1483,6 +1521,7 @@ D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = ""; }; D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = ""; }; D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; @@ -1609,6 +1648,7 @@ FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = ""; }; FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = ""; }; @@ -1642,6 +1682,7 @@ 2E7B4F88F81E37B4A9FF6C0F /* core */, 374BD863E6AD33189B7E4040 /* net */, 2FF0B5E0505D3AEA9A4ACF11 /* adv */, + 62E50658BDAD369D92294F68 /* webview */, 5C5CD199E7573C73AE6F392D /* media */, 60E51BFF5CD2327483201F14 /* html */, 60328E6EA3793DA990E18FC1 /* xrc */, @@ -1652,6 +1693,7 @@ B8F95052522B37AB86DA8917 /* propgrid */, 64B126D857113F24BA8C4758 /* richtext */, E96566B813153B4295AD767B /* stc */, + 52DDFBAA5ACC394FB6B30E74 /* libzlib */, EB288BE7E74B3328B762A461 /* libtiff */, 7650A73F7FC9305EA62DAE86 /* libjpeg */, 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, @@ -1820,6 +1862,7 @@ 66411D54BAD338498AC59401 /* xh_scrol.cpp */, E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */, 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, 950D51915EF83B57B5E8306F /* xh_spin.cpp */, @@ -1903,7 +1946,7 @@ isa = PBXGroup; children = ( C23A03BC68833F7E8BA62CF1 /* src/xml */, - D957B1B354FC327288FDF9DB /* src/common */, + D957B1B354FC327288FDF9DC /* src/common */, ); name = xml; sourceTree = ""; @@ -1925,10 +1968,18 @@ name = src/richtext; sourceTree = ""; }; + 52DDFBAA5ACC394FB6B30E74 /* libzlib */ = { + isa = PBXGroup; + children = ( + A7471B15D7093D38B8649962 /* src/zlib */, + ); + name = libzlib; + sourceTree = ""; + }; 5C5CD199E7573C73AE6F392D /* media */ = { isa = PBXGroup; children = ( - D957B1B354FC327288FDF9DA /* src/common */, + D957B1B354FC327288FDF9DB /* src/common */, ); name = media; sourceTree = ""; @@ -1950,6 +2001,15 @@ name = html; sourceTree = ""; }; + 62E50658BDAD369D92294F68 /* webview */ = { + isa = PBXGroup; + children = ( + F494694AB1FD30DEA2087AFD /* src/osx */, + D957B1B354FC327288FDF9DA /* src/common */, + ); + name = webview; + sourceTree = ""; + }; 64B126D857113F24BA8C4758 /* richtext */ = { isa = PBXGroup; children = ( @@ -2072,9 +2132,9 @@ 816DD323A67F3B299C8F3481 /* opengl */ = { isa = PBXGroup; children = ( - D957B1B354FC327288FDF9DC /* src/common */, + D957B1B354FC327288FDF9DD /* src/common */, D1F5E5C8429235E68E4AC903 /* src/osx/iphone */, - F494694AB1FD30DEA2087AFD /* src/osx */, + F494694AB1FD30DEA2087AFE /* src/osx */, ); name = opengl; sourceTree = ""; @@ -2314,6 +2374,28 @@ name = src/tiff/libtiff; sourceTree = ""; }; + A7471B15D7093D38B8649962 /* src/zlib */ = { + isa = PBXGroup; + children = ( + 0E45F6DF601A34BCB3CC0206 /* adler32.c */, + D4C4495603293C07A3B09D54 /* compress.c */, + 7013DB195D023C31ADE68546 /* crc32.c */, + 3CF73F49AEC238C99CE89845 /* deflate.c */, + 7A24E9101688368296C21EBE /* gzclose.c */, + 7395814D42CC38F6B8CD81B4 /* gzlib.c */, + BAD4614CABC934D6AFF8D9CD /* gzread.c */, + 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */, + FDB0E2D0966C3E408C4A2D3D /* infback.c */, + 400275BE019D3E5BA47988BE /* inffast.c */, + B5370A676AAC32419D7FDD87 /* inflate.c */, + 9D6B0D32537D35069C7E053F /* inftrees.c */, + 95B4EDF38F8A3E5EBAFF560F /* trees.c */, + 513033E36E643593AC305B3D /* uncompr.c */, + 4CB467F9898C3952A68D988B /* zutil.c */, + ); + name = src/zlib; + sourceTree = ""; + }; AC04244D4E183DF480908046 /* src/osx/core */ = { isa = PBXGroup; children = ( @@ -2868,7 +2950,9 @@ D957B1B354FC327288FDF9DA /* src/common */ = { isa = PBXGroup; children = ( - C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */, + 0DA80913C0E33144A42BD30F /* webview.cpp */, + 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */, + CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */, ); name = src/common; sourceTree = ""; @@ -2876,12 +2960,20 @@ D957B1B354FC327288FDF9DB /* src/common */ = { isa = PBXGroup; children = ( - 4048A3523EC03409BD899BEF /* xtixml.cpp */, + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */, ); name = src/common; sourceTree = ""; }; D957B1B354FC327288FDF9DC /* src/common */ = { + isa = PBXGroup; + children = ( + 4048A3523EC03409BD899BEF /* xtixml.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DD /* src/common */ = { isa = PBXGroup; children = ( E08A51FA8D8A361681B07295 /* glcmn.cpp */, @@ -2962,6 +3054,14 @@ sourceTree = ""; }; F494694AB1FD30DEA2087AFD /* src/osx */ = { + isa = PBXGroup; + children = ( + 5FEECFD764E037288CE94FEB /* webview_webkit.mm */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFE /* src/osx */ = { isa = PBXGroup; children = ( FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */, @@ -3491,6 +3591,10 @@ 46F341B46F80376B962759F5 /* animateg.cpp in Sources */, CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */, 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */, + 2DBF5F96CCC63F7481C26A43 /* webview_webkit.mm in Sources */, + 64A716F87A5136F9A790EC5A /* webview.cpp in Sources */, + 5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */, + 048986FB629E313EA670CD0C /* webviewfshandler.cpp in Sources */, DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */, 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */, BAA75384DA82370298672333 /* helpctrl.cpp in Sources */, @@ -3561,6 +3665,7 @@ FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */, E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, @@ -3629,6 +3734,21 @@ E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */, + BE3ED6EF34303867B8C8E923 /* compress.c in Sources */, + AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */, + 8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */, + 213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */, + 0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */, + 4B996B4C54163D7091427DB5 /* gzread.c in Sources */, + 4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */, + 5EE94793DFCB3BA281A4864E /* infback.c in Sources */, + 10743B74A58231639C6BF610 /* inffast.c in Sources */, + 42AC484FDD7D3E948CEA801C /* inflate.c in Sources */, + 3813146434693234965C4F31 /* inftrees.c in Sources */, + 1CC5AEC6C08E3600801CDADA /* trees.c in Sources */, + 9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */, + 42260A6F1853361083803B0C /* zutil.c in Sources */, 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, diff --git a/software/scsi2sd-util/wxWidgets/build/osx/wxvers.xcconfig b/software/scsi2sd-util/wxWidgets/build/osx/wxvers.xcconfig index 5db5b04b..c950579a 100644 --- a/software/scsi2sd-util/wxWidgets/build/osx/wxvers.xcconfig +++ b/software/scsi2sd-util/wxWidgets/build/osx/wxvers.xcconfig @@ -1,4 +1,4 @@ // update this file with new version numbers DYLIB_COMPATIBILITY_VERSION = 3.0 -DYLIB_CURRENT_VERSION = 3.0.1 +DYLIB_CURRENT_VERSION = 3.0.2 diff --git a/software/scsi2sd-util/wxWidgets/build/tools/bld_chm_exe.bat b/software/scsi2sd-util/wxWidgets/build/tools/bld_chm_exe.bat index b182311b..3a9a5a7c 100644 --- a/software/scsi2sd-util/wxWidgets/build/tools/bld_chm_exe.bat +++ b/software/scsi2sd-util/wxWidgets/build/tools/bld_chm_exe.bat @@ -1,5 +1,5 @@ rem Uncomment the next line to set the version; used also in wxWidgets.iss -SET WXW_VER=3.0.1 +SET WXW_VER=3.0.2 if (%WXW_VER%)==() SET WXW_VER=SVN echo docs building for %WXW_VER% diff --git a/software/scsi2sd-util/wxWidgets/configure b/software/scsi2sd-util/wxWidgets/configure index c7291e20..aa525389 100755 --- a/software/scsi2sd-util/wxWidgets/configure +++ b/software/scsi2sd-util/wxWidgets/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.1. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='wxWidgets 3.0.1' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='wxWidgets 3.0.2' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' PACKAGE_URL='' @@ -1960,7 +1960,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 3.0.1 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2029,7 +2029,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.0.1:";; + short | recursive ) echo "Configuration of wxWidgets 3.0.2:";; esac cat <<\_ACEOF @@ -2488,7 +2488,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.0.1 +wxWidgets configure 3.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3342,7 +3342,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 3.0.1, which was +It was created by wxWidgets $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3805,7 +3805,7 @@ fi wx_major_version_number=3 wx_minor_version_number=0 -wx_release_number=1 +wx_release_number=2 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -37466,6 +37466,7 @@ if test "$wxUSE_MAC" = 1 ; then else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then if test "$cross_compiling" != "no"; then wx_cv_target_x86_64=no @@ -37498,6 +37499,8 @@ $as_echo "$wx_cv_target_x86_64" >&6; } if test "$wx_cv_target_x86_64" != "yes"; then EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" fi + + fi fi fi fi @@ -41941,7 +41944,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 3.0.1, which was +This file was extended by wxWidgets $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42007,7 +42010,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 3.0.1 +wxWidgets config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/software/scsi2sd-util/wxWidgets/configure.in b/software/scsi2sd-util/wxWidgets/configure.in index 56812db3..f6b58753 100644 --- a/software/scsi2sd-util/wxWidgets/configure.in +++ b/software/scsi2sd-util/wxWidgets/configure.in @@ -14,7 +14,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.0.1], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [3.0.2], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -40,7 +40,7 @@ dnl wx_release_number += 1 wx_major_version_number=3 wx_minor_version_number=0 -wx_release_number=1 +wx_release_number=2 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -7716,11 +7716,14 @@ if test "$wxUSE_MAC" = 1 ; then else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" - dnl The case of QuickTime framework is special: we only need it in - dnl 32 bit builds and not in 64 bit and, moreover, linking with it - dnl in 64 bit builds results in a warning because the framework is - dnl not available in 64 bits itself. So make an effort to avoid it - dnl when building for 64 bits only (i.e. not universal build). + dnl The case of QuickTime framework is special: with Cocoa, we only + dnl need it in 32 bit builds and not in 64 bit and, moreover, + dnl linking with it in 64 bit builds results in a warning because + dnl the framework is not available in 64 bits itself. So make an + dnl effort to avoid using it unnecessarily. Note that with Carbon + dnl we also need it for wxSound an as Carbon is itself not + dnl available in 64 bits anyhow, there is no reason to avoid it. + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then if test "$cross_compiling" != "no"; then dnl The check below doesn't work well when cross-compiling @@ -7747,6 +7750,8 @@ if test "$wxUSE_MAC" = 1 ; then if test "$wx_cv_target_x86_64" != "yes"; then EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" fi + + fi fi fi fi diff --git a/software/scsi2sd-util/wxWidgets/demos/bombs/Makefile.in b/software/scsi2sd-util/wxWidgets/demos/bombs/Makefile.in index dea56cc7..cac008c4 100644 --- a/software/scsi2sd-util/wxWidgets/demos/bombs/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/demos/bombs/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc8.vcproj b/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc8.vcproj index 5a650cc9..c7cdc5ef 100644 --- a/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc9.vcproj b/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc9.vcproj index c1eab405..92a84304 100644 --- a/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/bombs/bombs_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/forty/Makefile.in b/software/scsi2sd-util/wxWidgets/demos/forty/Makefile.in index 67081fd1..ac94c749 100644 --- a/software/scsi2sd-util/wxWidgets/demos/forty/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/demos/forty/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc8.vcproj b/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc8.vcproj index a20247b5..1493f276 100644 --- a/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc9.vcproj b/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc9.vcproj index fa5d00a9..3c5da979 100644 --- a/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/forty/forty_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/fractal/Makefile.in b/software/scsi2sd-util/wxWidgets/demos/fractal/Makefile.in index 49b220c5..3b75b4ea 100644 --- a/software/scsi2sd-util/wxWidgets/demos/fractal/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/demos/fractal/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc8.vcproj b/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc8.vcproj index 5e5b9da5..32e3c0aa 100644 --- a/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc9.vcproj b/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc9.vcproj index bcb43262..f15537db 100644 --- a/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/fractal/fractal_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/life/Makefile.in b/software/scsi2sd-util/wxWidgets/demos/life/Makefile.in index 8612d109..21b3336a 100644 --- a/software/scsi2sd-util/wxWidgets/demos/life/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/demos/life/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/demos/life/life_vc8.vcproj b/software/scsi2sd-util/wxWidgets/demos/life/life_vc8.vcproj index 2f00c8c7..89885be5 100644 --- a/software/scsi2sd-util/wxWidgets/demos/life/life_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/life/life_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/life/life_vc9.vcproj b/software/scsi2sd-util/wxWidgets/demos/life/life_vc9.vcproj index b1c85446..21558cd9 100644 --- a/software/scsi2sd-util/wxWidgets/demos/life/life_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/life/life_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/poem/Makefile.in b/software/scsi2sd-util/wxWidgets/demos/poem/Makefile.in index 6ef2be2a..1cc78090 100644 --- a/software/scsi2sd-util/wxWidgets/demos/poem/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/demos/poem/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc8.vcproj b/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc8.vcproj index 28082734..b0ecca2d 100644 --- a/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc9.vcproj b/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc9.vcproj index 1e50a2e7..085a8ca8 100644 --- a/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/demos/poem/poem_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/docs/changes.txt b/software/scsi2sd-util/wxWidgets/docs/changes.txt index a8c92349..72e7d422 100644 --- a/software/scsi2sd-util/wxWidgets/docs/changes.txt +++ b/software/scsi2sd-util/wxWidgets/docs/changes.txt @@ -574,6 +574,56 @@ Major new features in this release +3.0.2: (released 2014-10-06) +---------------------------- + +All: + +- Fix silent data loss in wx[F]File::Write(wxString) if conversion fails. +- Make wxString::FromCDouble() work when the global C++ locale is not the C one. +- Add support for "%V", "%G" and "%g" to wxDateTime::Format(). + +All (GUI): + +- Add wxGenericListCtrl::EndEditLabel() (Tim Kosse). +- Implement bounding box computation in wxGCDC (Toni Ruža). +- Fix saving GIF animations with 2.5s+ delays between frames (elvissteinjr). +- Add "variant" property to windows in XRC. +- Add XRC handler for wxSimplebook. +- Return correct value from wxCommandEvent::GetString() for programmatically + generated wxEVT_TEXT events from wxComboBox. +- Accept "default" as font family value in XRC (pieleric). +- Send events when toggling wxPropertyGrid nodes from keyboard (Armel Asselin). + +wxGTK: + +- Fix mouse handling in wxNotebook containing wxListCtrl (Charlie Fenton). +- Fix layout of wxSearchCtrl to not truncate text in it. + +wxMSW: + +- Fix Cygwin 1.7 build. +- Work around a bug in MinGW 4.8 headers and fix build with it too. +- Include x64 configurations in MSVC 8/9 project files too. +- Fix parallel build of MSVC 11/12 solutions (Artur Wieczorek). +- Fix background of wxRadioBox buttons and wxSlider (Artur Wieczorek). +- Fix appearance of wxToggleButtons with non default colours (Artur Wieczorek). +- Fix drawing on wxDC when using right-to-left layout (Artur Wieczorek). +- Fix wxGrid appearance and behaviour in RTL (Artur Wieczorek). +- Fix creating wxBitmap from monochrome wxIcon or wxCursor (Artur Wieczorek). +- Fix handling of bitmaps with alpha in wxImageList (Artur Wieczorek). +- Add paragraph spacing attributes support to wxTextCtrl (dannchr). +- Show new style directory selector even for non existent paths (raychow). +- Fix order of radial gradient stops (Alexandru Pana). +- Fix font created using wxFont(wxFontInfo()) ctor. +- Fix wxFileName::GetShortcutTarget() in console applications. +- Fix wxFileName::MakeRelativeTo() for shortcut files (gafatoa). +- Fix height of initially empty wxBitmapComboBox (Artur Wieczorek). +- Fix setting label of submenu items (Artur Wieczorek). +- Fix using Esc as accelerator in the menus. +- Fix wrong initial status bar height in some cases (Artur Wieczorek). + + 3.0.1: (released 2014-06-15) ---------------------------- @@ -608,6 +658,7 @@ All (GUI): - Fix handling of custom colours in wxPropertyGrid choices (Artur Wieczorek). - Add "hint" property to wxTextCtrl XRC handler. - Allow using wxALIGN_CENTER, and not just CENTRE, in XRC for wxStaticText. +- Handle files used in wxAnimationCtrl "animation" property in wxrc. wxGTK: diff --git a/software/scsi2sd-util/wxWidgets/docs/doxygen/Doxyfile b/software/scsi2sd-util/wxWidgets/docs/doxygen/Doxyfile index adb924dd..b7a47754 100644 --- a/software/scsi2sd-util/wxWidgets/docs/doxygen/Doxyfile +++ b/software/scsi2sd-util/wxWidgets/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.0.1 +PROJECT_NUMBER = 3.0.2 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/software/scsi2sd-util/wxWidgets/docs/doxygen/latexdocstart.inc b/software/scsi2sd-util/wxWidgets/docs/doxygen/latexdocstart.inc index 77cac13c..8c849100 100644 --- a/software/scsi2sd-util/wxWidgets/docs/doxygen/latexdocstart.inc +++ b/software/scsi2sd-util/wxWidgets/docs/doxygen/latexdocstart.inc @@ -49,7 +49,7 @@ \end{center} \end{figure} \vspace*{2cm} -{\large Version 3.0.1 }\\ +{\large Version 3.0.2 }\\ \vspace*{1cm} {Generated on \today}\\ \end{center} diff --git a/software/scsi2sd-util/wxWidgets/docs/doxygen/mainpages/manual.h b/software/scsi2sd-util/wxWidgets/docs/doxygen/mainpages/manual.h index f7bb086c..dbba1ccf 100644 --- a/software/scsi2sd-util/wxWidgets/docs/doxygen/mainpages/manual.h +++ b/software/scsi2sd-util/wxWidgets/docs/doxygen/mainpages/manual.h @@ -14,7 +14,7 @@ @author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor, Bryan Petty, Francesco Montorsi, Robert Roebling et al -@date June 15, 2014 +@date October 6, 2014 @n diff --git a/software/scsi2sd-util/wxWidgets/docs/doxygen/overviews/xrc_format.h b/software/scsi2sd-util/wxWidgets/docs/doxygen/overviews/xrc_format.h index e70c12b6..8c28a594 100644 --- a/software/scsi2sd-util/wxWidgets/docs/doxygen/overviews/xrc_format.h +++ b/software/scsi2sd-util/wxWidgets/docs/doxygen/overviews/xrc_format.h @@ -401,8 +401,8 @@ and can be one of the following "sub-properties": @row3col{weight, enum, One of "normal", "bold" or "light" (default: normal).} @row3col{family, enum, - One of "roman", "script", "decorative", "swiss", "modern" or "teletype" - (default: roman).} + One of "default", "roman", "script", "decorative", "swiss", "modern" or "teletype" + (default: default).} @row3col{underlined, @ref overview_xrcformat_type_bool, Whether the font should be underlined (default: 0).} @row3col{face, , @@ -519,6 +519,8 @@ from properties lists below. If set to 1, the control is created hidden (default: 0).} @row3col{tooltip, @ref overview_xrcformat_type_text, Tooltip to use for the control (default: not set).} +@row3col{variant, @ref overview_xrcformat_type_string, + Window variant (see wxWindow::SetWindowVariant()), one of "normal", "small", "mini" or "large" (default: "normal") (new since wxWidgets 3.0.2).} @row3col{font, @ref overview_xrcformat_type_font, Font to use for the control (default: window's default).} @row3col{ownfont, @ref overview_xrcformat_type_font, @@ -1700,6 +1702,32 @@ HTML markup. Note that the markup has to be escaped: @endcode +@subsubsection xrc_wxsimplebook wxSimplebook + +wxSimplebook is similar to @ref xrc_wxnotebook "wxNotebook" but simpler: as it +doesn't show any page headers, it doesn't use neither image list nor individual +page bitmaps and while it still accepts page labels, they are optional as they +are not shown to the user neither. + +So @c simplebookpage child elements, that must occur inside this object, only +have the following properties: + +@c choicebookpage objects have the following properties: + +@beginTable +@hdr3col{property, type, description} +@row3col{label, @ref overview_xrcformat_type_text, + Page's label (default: empty).} +@row3col{selected, @ref overview_xrcformat_type_bool, + Is the page selected initially (only one page can be selected; default: 0)?} +@endTable + +As with all the other book page elements, each @c simplebookpage must have +exactly one non-toplevel window as its child. + +@since 3.0.2 + + @subsubsection xrc_wxslider wxSlider @beginTable diff --git a/software/scsi2sd-util/wxWidgets/docs/msw/install.txt b/software/scsi2sd-util/wxWidgets/docs/msw/install.txt index 6d24e720..c24df87f 100644 --- a/software/scsi2sd-util/wxWidgets/docs/msw/install.txt +++ b/software/scsi2sd-util/wxWidgets/docs/msw/install.txt @@ -465,7 +465,9 @@ NB: The makefiles and project files provided with wxWidgets samples show which sample and adapt it to your application. Independently of the compiler and make/IDE you are using you must do the -following to use wxWidgets: +following to use wxWidgets sources under the directory $WXWIN (notice that +different tool chains refer to environment variables such as WXWIN in +different ways, e.g. MSVC users should use $(WXWIN) instead of just $WXWIN): * Add $WXWIN/include to the - compiler @@ -489,7 +491,8 @@ following to use wxWidgets: (all wxWidgets applications use the base library). -Microsoft Visual C++ users can simplify the linker setup by prepending the -directory $WXWIN/msvc to the include path (it must come before $WXWIN/include -directory!) and omitting the last step: the required libraries will be linked -in automatically using the "#pragma comment(lib)" feature of this compiler. +Microsoft Visual C++ users can simplify the linker setup by prepending +"$(WXWIN)/include/msvc" to the include path (it must come before the +"$(WXWIN)/include" part!) and omitting the last step: the required libraries +will be linked in automatically using the "#pragma comment(lib)" feature of +this compiler. diff --git a/software/scsi2sd-util/wxWidgets/docs/publicity/announce.txt b/software/scsi2sd-util/wxWidgets/docs/publicity/announce.txt index 96e485e1..867c5158 100644 --- a/software/scsi2sd-util/wxWidgets/docs/publicity/announce.txt +++ b/software/scsi2sd-util/wxWidgets/docs/publicity/announce.txt @@ -1,15 +1,15 @@ -June 15, 2014 -- The wxWidgets team is pleased to announce a +October 6, 2014 -- The wxWidgets team is pleased to announce a major new release of our open source framework for the development of native cross-platform applications in C++. -wxWidgets 3.0.1 is a stable bug fix release in 3.0 branch and is +wxWidgets 3.0.2 is a stable bug fix release in 3.0 branch and is available at - https://sourceforge.net/downloads/wxwindows/3.0.1/ + https://sourceforge.net/downloads/wxwindows/3.0.2/ and at our FTP mirror at - ftp://ftp.wxwidgets.org/pub/3.0.1/ + ftp://ftp.wxwidgets.org/pub/3.0.2/ Please choose the archive format suitable for your platform, i.e. 7z or ZIP for Windows platforms and tar.bz2 for the Unix systems @@ -22,61 +22,64 @@ as only sources, not binaries, are installed. We also provide the pre-built versions of wxMSW libraries for the selected compilers at - https://sourceforge.net/downloads/wxwindows/3.0.1/binaries/ + https://sourceforge.net/downloads/wxwindows/3.0.2/binaries/ Please see the README file there for the descriptions of the individual files. -This release is perfectly compatible with 3.0.0 at both the source -(API) and binary (ABI) level and upgrading to it is strongly -recommended for all users of wxWidgets 3.0.0 as it contains more than -a hundred important bug fixes since it. +This is a bug fix release with no significant new features compared to +the previous 3.0.x releases and compatible with them at both the API +and the ABI level (i.e. all applications linked against earlier 3.0.x +DLLs or shared libraries will continue to work when using 3.0.2 +libraries). -The most important user-visible changes are: - -* In all ports: - - wxHTML displays tables much faster now. - - Double clicking wxGrid columns doesn't make them too small any more. - - Fix bugs when dragging columns in wxGrid with hidden columns. - - Loading ICO files with PNG data is now supported. +Some of the changes: * In wxGTK: - - Mouse wheel scrolling in wxListCtrl works again. - - wxStaticBoxSizer contents is not truncated any more. - - AUI panels may now be re-docked after floating them. + - Fix wxSearchCtrl layout. + - Fix mouse handling in wxListCtrl and wxTreeCtrl inside wxNotebook. + - Avoid some GTK+ warnings. * In wxMSW: - - wxBitmapComboBox works again and doesn't just remain blank. - - Checkboxes in wxDataViewCtrl work again too now. - - wxCheckListBox appears correctly when using large fonts. + - Cygwin 1.7 and MinGW 4.8 build fixes. + - Fix parallel build in MSVS 2010+ solutions. + - Add x64 configurations to MSVS 2005/2008 projects too. + - Fix using Esc as accelerator in the menus. + - Fix wxRadioBox, wxSlider, wxToggleButton with non-default colours. + - RTL support fixes for wxDC and wxGrid. * In wxOSX: - - Cancelling choice selection in wxDataViewCtrl doesn't crash any more. - - ShowModal() doesn't use quite as much CPU now. - -There are also many other bug fixes, including many improvements to -alpha transparency handling in different places (mostly in wxMSW, but -also in wxGTK) and resource/memory leak fixes in all ports. - -Finally, this release includes Visual Studio 2012 and 2013 projects for -building wxWidgets, in addition to the project files for the previous -versions already provided in 3.0.0 release. - -Please see the changes.txt file in the "docs" subdirectory of -wxWidgets distribution or also available online at -https://sourceforge.net/projects/wxwindows/files/3.0.1/changes.txt -for more details and please read the "INCOMPATIBLE CHANGES" section -in its beginning for a brief description of changes if you are -upgrading from wxWidgets 2.8. For more details, please see -http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html - - -We recommend that you upgrade to wxWidgets 3.0.1 if you already use -wxWidgets 3.0.0, the upgrade is completely transparent and doesn't -require any changes in the existing code. If you are still using -wxWidgets 2.8 or earlier, please consider updating to wxWidgets 3.0 -to profit from all the new functionality. + - Avoid compilation warnings when using 10.10 SDK. + - Enhancements to retina support. + +Despite of the focus on bug fixes, a few new features have +nevertheless made it into this release as well: + + - Add support for "%V", "%G" and "%g" to wxDateTime::Format(). + - Added an XRC handler for wxSimplebook. + - Allow to specify the "variant" window property in XRC. + - Add wxGenericListCtrl::EndEditLabel(). + +Other changes in this release are described in the file +docs/changes.txt available online at + + https://sourceforge.net/projects/wxwindows/files/3.0.2/changes.txt + +This file also contains information about the changes in 3.0 compared +to earlier versions of wxWidgets, please read it, and especially its +"INCOMPATIBLE CHANGES" section, if you are upgrading from wxWidgets +2.8 or earlier. And for even more details, please see + + http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html + + + +We recommend that you upgrade to wxWidgets 3.0.2 if you already use an +earlier wxWidgets 3.0.x release, the upgrade is completely transparent +and doesn't require any changes in the existing code. If you are still +using wxWidgets 2.8 or earlier, please consider updating to wxWidgets +3.0 to profit from all the new functionality. We hope that you will enjoy using the new release! diff --git a/software/scsi2sd-util/wxWidgets/docs/readme.txt b/software/scsi2sd-util/wxWidgets/docs/readme.txt index df708811..3e49392e 100644 --- a/software/scsi2sd-util/wxWidgets/docs/readme.txt +++ b/software/scsi2sd-util/wxWidgets/docs/readme.txt @@ -1,4 +1,4 @@ - wxWidgets 3.0.1 Release Notes + wxWidgets 3.0.2 Release Notes ============================= Welcome to the latest stable release of wxWidgets, a free and open @@ -18,17 +18,17 @@ You can learn more about wxWidgets at and read its documentation online at - http://docs.wxwidgets.org/3.0.1/ + http://docs.wxwidgets.org/3.0.2/ wxWidgets sources and binaries for the selected platforms are available for download from - https://sourceforge.net/projects/wxwindows/files/3.0.1/ + https://sourceforge.net/projects/wxwindows/files/3.0.2/ or - ftp://ftp.wxwidgets.org/pub/3.0.1/ + ftp://ftp.wxwidgets.org/pub/3.0.2/ Please see the "Files" section below for the description of various files available at these locations. @@ -39,43 +39,49 @@ Changes in this release ----------------------- This is a bug fix release with no significant new features compared to -3.0.0 and compatible with it at both the API and the ABI level (i.e. -all applications linked against 3.0.0 DLLs or shared libraries will -continue to work when using 3.0.1 libraries). +the previous 3.0.x releases and compatible with them at both the API +and the ABI level (i.e. all applications linked against earlier 3.0.x +DLLs or shared libraries will continue to work when using 3.0.2 +libraries). -There were more than a hundred bug fixes, please see docs/changes.txt -for more details. The most important user-visible changes are: - -* In all ports: - - wxHTML displays tables much faster now. - - Double clicking wxGrid columns doesn't make them too small any more. - - Fix bugs when dragging columns in wxGrid with hidden columns. - - Loading ICO files with PNG data is now supported. +Some of the changes: * In wxGTK: - - Mouse wheel scrolling in wxListCtrl works again. - - wxStaticBoxSizer contents is not truncated any more. - - AUI panels may now be re-docked after floating them. + - Fix wxSearchCtrl layout. + - Fix mouse handling in wxListCtrl and wxTreeCtrl inside wxNotebook. + - Avoid some GTK+ warnings. * In wxMSW: - - wxBitmapComboBox works again and doesn't just remain blank. - - Checkboxes in wxDataViewCtrl work again too now. - - wxCheckListBox appears correctly when using large fonts. + - Cygwin 1.7 and MinGW 4.8 build fixes. + - Fix parallel build in MSVS 2010+ solutions. + - Add x64 configurations to MSVS 2005/2008 projects too. + - Fix using Esc as accelerator in the menus. + - Fix wxRadioBox, wxSlider, wxToggleButton with non-default colours. + - RTL support fixes for wxDC and wxGrid. * In wxOSX: - - Cancelling choice selection in wxDataViewCtrl doesn't crash any more. - - ShowModal() doesn't use quite as much CPU now. + - Avoid compilation warnings when using 10.10 SDK. + - Enhancements to retina support. + +Despite of the focus on bug fixes, a few new features have +nevertheless made it into this release as well: + + - Add support for "%V", "%G" and "%g" to wxDateTime::Format(). + - Added an XRC handler for wxSimplebook. + - Allow to specify the "variant" window property in XRC. + - Add wxGenericListCtrl::EndEditLabel(). + +Other changes in this release are described in the file +docs/changes.txt available online at -There are also many other bug fixes, including many improvements to -alpha transparency handling in different places (mostly in wxMSW, but -also in wxGTK) and resource/memory leak fixes in all ports. + https://sourceforge.net/projects/wxwindows/files/3.0.2/changes.txt -Finally, this release includes Visual Studio 2012 and 2013 projects for -building wxWidgets, in addition to the project files for the previous -versions already provided in 3.0.0 release. +This file also contains information about the changes in 3.0 compared +to earlier versions of wxWidgets, please read it, and especially its +"INCOMPATIBLE CHANGES" section, if you are upgrading from wxWidgets +2.8 or earlier. And for even more details, please see -Please make sure to read the section "Incompatible changes since 2.8" -in docs/changes.txt if you are upgrading from wxWidgets 2.8 or earlier. + http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html Platforms supported @@ -209,4 +215,4 @@ If you are looking for support, you can get it from Have fun! -The wxWidgets Team, July 2014 +The wxWidgets Team, October 2014 diff --git a/software/scsi2sd-util/wxWidgets/docs/release_binaries.mdwn b/software/scsi2sd-util/wxWidgets/docs/release_binaries.mdwn index 72dbd9a2..a09de787 100644 --- a/software/scsi2sd-util/wxWidgets/docs/release_binaries.mdwn +++ b/software/scsi2sd-util/wxWidgets/docs/release_binaries.mdwn @@ -1,7 +1,7 @@ -wxWidgets 3.0.0 Binaries +wxWidgets 3.0.1 Binaries ======================== -This directory contains binary files for wxWidgets 3.0.0 release. +This directory contains binary files for wxWidgets 3.0.1 release. * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0 and 12.0 corresponding to marketing product names of Microsoft Visual Studio @@ -14,9 +14,9 @@ For Developers -------------- For developing applications with wxWidgets you need to download the -compiler-independent wxWidgets-3.0.0_Headers.7z file (found in the -parent directory) and one of wxMSW-3.0.0-vcXXX_Dev.7z or -wxMSW-3.0.0_gccXXX_Dev.7z files depending on your compiler, its +compiler-independent wxWidgets-3.0.1_Headers.7z file (found in the +parent directory) and one of wxMSW-3.0.1-vcXXX_Dev.7z or +wxMSW-3.0.1_gccXXX_Dev.7z files depending on your compiler, its version and the target architecture (x86 if not specified or x64). Unpack both files into the same directory so that "include" and "lib" @@ -30,15 +30,15 @@ symbols. For End Users ------------- -End users may download one of wxMSW-3.0.0_vcXXX_ReleaseDLL.7z or -wxMSW-3.0.0_gccXXX_ReleaseDLL.7z files to get just the DLLs +End users may download one of wxMSW-3.0.1_vcXXX_ReleaseDLL.7z or +wxMSW-3.0.1_gccXXX_ReleaseDLL.7z files to get just the DLLs required for running the applications using wxWidgets. For Debugging ------------- -* Microsoft Visual C++ users: Files wxMSW-3.0.0_vcXXX_ReleasePDB.7z +* Microsoft Visual C++ users: Files wxMSW-3.0.1_vcXXX_ReleasePDB.7z contain the debug symbols for the release build of the DLLs. Download them if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved @@ -61,48 +61,48 @@ forward to hearing from you on [wx-users mailing list](http://groups.google.com/ Check Sums ---------- -To verify your download you can use the following sha1sums: - - 4c6bf24df85bc0fb1bce3091557963ec4c79b5f4 wxMSW-3.0.0_gcc471TDM_Dev.7z - c35de8230a0e006883b58078b1bcb597a923b110 wxMSW-3.0.0_gcc471TDM_ReleaseDLL.7z - 5844ad74ef07f468f36a4b232e28bb5c6753eb91 wxMSW-3.0.0_gcc471TDM_x64_Dev.7z - df3129074172278d1837d7c7698e5466dcdd87af wxMSW-3.0.0_gcc471TDM_x64_ReleaseDLL.7z - 34268fdd29b3d3b904234796cae847c9648119f7 wxMSW-3.0.0_gcc481TDM_Dev.7z - 15871a10eb3d2c005e34ea20ea921400d51b7392 wxMSW-3.0.0_gcc481TDM_ReleaseDLL.7z - 3f89fd4e8f78f26c18cfee4781a2a6c1e3ae2655 wxMSW-3.0.0_gcc481TDM_x64_Dev.7z - 013c2f7ab65182f8c6c9d805a16d23827ed24c9e wxMSW-3.0.0_gcc481TDM_x64_ReleaseDLL.7z - 1a3ba38a309182a32f24225f392b3a35a31f9ea1 wxMSW-3.0.0_vc90_Dev.7z - 97ace7370b85813cb04196fbe71bc1caeb08bb79 wxMSW-3.0.0_vc90_ReleaseDLL.7z - ad98029154d9a0ef2d7d62756f796c82715a2c02 wxMSW-3.0.0_vc90_x86_ReleaseDLL.msi - 83c727c2337eaee4dc93e90d33a85b0dafe9b745 wxMSW-3.0.0_vc90_ReleasePDB.7z - b14eb5cab613cc583ada83ed38113dee9b8b08bb wxMSW-3.0.0_vc90_x64_Dev.7z - 1cf0d5918e961e31b67d70530e00be6cac06af57 wxMSW-3.0.0_vc90_x64_ReleaseDLL.7z - 6ab1d777b784c7e02a331577f6d676f51261af25 wxMSW-3.0.0_vc90_x64_ReleaseDLL.msi - 839e5033e760508a3d50314056821a7e91a4a2e4 wxMSW-3.0.0_vc90_x64_ReleasePDB.7z - 397ee6d2de469647a3444df1def495bb16ba54b0 wxMSW-3.0.0_vc100_Dev.7z - 0e1b88b313ff438c1db840a60d146dee218deb6f wxMSW-3.0.0_vc100_ReleaseDLL.7z - 25cc1e30d09ae3823288e224572e2b5d89673b2a wxMSW-3.0.0_vc100_x86_ReleaseDLL.msi - 229136142f7d2980be72265ecc50eeea0096afca wxMSW-3.0.0_vc100_ReleasePDB.7z - 3e4e5a7a1eb800fe9d9be658c655ca49d6260791 wxMSW-3.0.0_vc100_x64_Dev.7z - eda263f3b1aae120e802aeab43ccc3ee45411a9e wxMSW-3.0.0_vc100_x64_ReleaseDLL.7z - 8991eb4d14f0b37a6aeed8f1f2ef71e2ee961fb0 wxMSW-3.0.0_vc100_x64_ReleaseDLL.msi - 86661c50965b3619f3d0f68a900ec8e1e0eaf9fb wxMSW-3.0.0_vc100_x64_ReleasePDB.7z - 2c25693325f8516a4e923fd520b540a4947b2757 wxMSW-3.0.0_vc110_Dev.7z - 1c81fd5cdb4c62c1494accc7f1c9ba9acabfa79c wxMSW-3.0.0_vc110_ReleaseDLL.7z - aab75c6db1d491d38544d4feaf721931ee7aabb3 wxMSW-3.0.0_vc110_x86_ReleaseDLL.msi - 4dbb2058b6c8c11e9d906f6520792103779c8518 wxMSW-3.0.0_vc110_ReleasePDB.7z - c64b64138450ce35c385f9f9d01ee44fb27a59b1 wxMSW-3.0.0_vc110_x64_Dev.7z - 5503382c0a1b2148fed5d856fc5ddfc01e59dada wxMSW-3.0.0_vc110_x64_ReleaseDLL.7z - 7da39e4370391e41e13d2be9f7d59b36a78a8a8c wxMSW-3.0.0_vc110_x64_ReleaseDLL.msi - cff85ab5a0a560cac5d1f196a8cf0a1c1025aab8 wxMSW-3.0.0_vc110_x64_ReleasePDB.7z - 448827167a64a9a7c270774d62d8673445acbe63 wxMSW-3.0.0_vc120_Dev.7z - 0df76ee66bea2b3c312c4a67d5b6383440a85d22 wxMSW-3.0.0_vc120_ReleaseDLL.7z - 7e3249a3b989340fc3e87b1ba0031563d326cd92 wxMSW-3.0.0_vc120_x86_ReleaseDLL.msi - d74c3913389b8c441480b1a9d4c79211a457c05b wxMSW-3.0.0_vc120_ReleasePDB.7z - 9f6b3290f5fd3b179ff148d1cfc2748ddc0839a9 wxMSW-3.0.0_vc120_x64_Dev.7z - d2d555d923f18b71d5f0538e88a8740573df12a6 wxMSW-3.0.0_vc120_x64_ReleaseDLL.7z - 9383ee555c45772865b01260da9d02a8658683da wxMSW-3.0.0_vc120_x64_ReleaseDLL.msi - d3f24aa95d80f4a04d2b211b99fae7ca368e77b6 wxMSW-3.0.0_vc120_x64_ReleasePDB.7z +To verify your download please use the following sha1sums: + + 18ece8798f037c86d3330b2e909a4022a0321100 wxMSW-3.0.1_gcc471TDM_Dev.7z + 167bf2bfcc072165318e42a7c84ae58099c2d4a8 wxMSW-3.0.1_gcc471TDM_ReleaseDLL.7z + 26dce50acdd349d60088e60d2bad3e283c4ddaa7 wxMSW-3.0.1_gcc471TDM_x64_Dev.7z + 04dbd607b0ab17c34c61975270f768b43dd65977 wxMSW-3.0.1_gcc471TDM_x64_ReleaseDLL.7z + bfc8ac6e01e977a93281029d376e9bc998d2ccf2 wxMSW-3.0.1_gcc481TDM_Dev.7z + 504e0897553706cb3934745ba89da2d153cfa945 wxMSW-3.0.1_gcc481TDM_ReleaseDLL.7z + f0801e9433e707290cd31f2e9476df0d4279a45d wxMSW-3.0.1_gcc481TDM_x64_Dev.7z + c81090181a0863aca6af91bba602db1f4304f7dd wxMSW-3.0.1_gcc481TDM_x64_ReleaseDLL.7z + 0811a37e86311888dc7b2328e9f834e2587816e1 wxMSW-3.0.1_vc90_Dev.7z + 04f0239e0b2f6fcde12235b539c80638d567a168 wxMSW-3.0.1_vc90_ReleaseDLL.7z + 5ae62332d01ddd99874f7dc76085c84f1558f676 wxMSW-3.0.1_vc90_ReleasePDB.7z + 42285a7da0a250fa475d36a579cf7bff56c5d153 wxMSW-3.0.1_vc90_x64_Dev.7z + 74738de7729236027e836bd71e05c5a2c0c8604f wxMSW-3.0.1_vc90_x64_ReleaseDLL.7z + 38cc78dff12ac1deb0f524cf49fca3f4b9c8f538 wxMSW-3.0.1_vc90_x64_ReleaseDLL.msi + e737f2542294f4952c398b23c543675610a02deb wxMSW-3.0.1_vc90_x64_ReleasePDB.7z + e184bd3f92164bff1f82ea2b1eda152c5df74656 wxMSW-3.0.1_vc90_x86_ReleaseDLL.msi + 7060348454cc48284b1d5abeeda6c31b45d85eda wxMSW-3.0.1_vc100_Dev.7z + c91fdf9499ffbc49cb5bd7241aac30f42c1f1399 wxMSW-3.0.1_vc100_ReleaseDLL.7z + 74e8a2eb81cca4eb189130206a6d91aa2759f0a9 wxMSW-3.0.1_vc100_ReleasePDB.7z + 4773be9e2b8deb007c06289bc0ac4969d2dec386 wxMSW-3.0.1_vc100_x64_Dev.7z + 76dc2d55698669f5de19bc149675961ab1115886 wxMSW-3.0.1_vc100_x64_ReleaseDLL.7z + efa6846cd9ad76109c20077d623d602e18a04997 wxMSW-3.0.1_vc100_x64_ReleaseDLL.msi + 77d886d0ef36cd32a4308abb75748ca567dd9251 wxMSW-3.0.1_vc100_x64_ReleasePDB.7z + cacd6023817935d1c47c3ffc3fd7e1f758c85279 wxMSW-3.0.1_vc100_x86_ReleaseDLL.msi + ea82f65254080a7a5680a0f9283e300a675ea68d wxMSW-3.0.1_vc110_Dev.7z + 9e2dcd558fc2bd64b90c7f4c76744ea3255b3c60 wxMSW-3.0.1_vc110_ReleaseDLL.7z + 1cff890303e9663f7243fe145d12a8fed60c5495 wxMSW-3.0.1_vc110_ReleasePDB.7z + 3c0c53350310d9fec37dbbd3cd35bdfb81d2a2dc wxMSW-3.0.1_vc110_x64_Dev.7z + de7d2f7580d080088e3f64c66d26cba931a6f4e9 wxMSW-3.0.1_vc110_x64_ReleaseDLL.7z + 4d7a49e3d67f6559ac8bfbbbecaba16653eee163 wxMSW-3.0.1_vc110_x64_ReleaseDLL.msi + 3670ac5cf20ea76e93fa6de8a91af5a6fe7a8de5 wxMSW-3.0.1_vc110_x64_ReleasePDB.7z + 2613d7c676ef35b4e08e32c6bf34f13083ac6e5b wxMSW-3.0.1_vc110_x86_ReleaseDLL.msi + 7ecd00f81661ef0d3cf19958afe14f3b3dec0618 wxMSW-3.0.1_vc120_Dev.7z + 888c2c1eabfda5d248e14d8b56165468825558d5 wxMSW-3.0.1_vc120_ReleaseDLL.7z + 760567170bf5373da42b239f9774b91920ffec95 wxMSW-3.0.1_vc120_ReleasePDB.7z + 97968a620d203d4f1b4f521b91ea9ec7ad3ca50f wxMSW-3.0.1_vc120_x64_Dev.7z + 0ba6d750feee3e4e3fbe79414b501aea6766ff60 wxMSW-3.0.1_vc120_x64_ReleaseDLL.7z + 693974bbec1d1b41c020332e17e60527eed76f7f wxMSW-3.0.1_vc120_x64_ReleaseDLL.msi + ad095523e1f0a13a354ec1d1512308c5b56d55b8 wxMSW-3.0.1_vc120_x64_ReleasePDB.7z + 5aaee8c78fb03c13dcd05656f7c46f4ec02ab625 wxMSW-3.0.1_vc120_x86_ReleaseDLL.msi Credit diff --git a/software/scsi2sd-util/wxWidgets/docs/release_files.mdwn b/software/scsi2sd-util/wxWidgets/docs/release_files.mdwn index b50ffe0b..0bf81f0d 100644 --- a/software/scsi2sd-util/wxWidgets/docs/release_files.mdwn +++ b/software/scsi2sd-util/wxWidgets/docs/release_files.mdwn @@ -1,18 +1,22 @@ -wxWidgets 3.0.0 +wxWidgets 3.0.1 =============== This directory contains the files containing the sources and documentation of -wxWidgets 3.0.0 release. Please see the binaries subdirectory for the binaries +wxWidgets 3.0.1 release. Please see the binaries subdirectory for the binaries for the selected platforms/compilers. Please notice that since the 2.9 series only a single source distribution is provided instead of the multiple distributions containing only the files for -each port as was done before. So you only need to download wxWidgets-3.0.0.zip +each port as was done before. So you only need to download wxWidgets-3.0.1.zip (or .7z for much smaller archive size) for Microsoft Windows systems or -wxWidgets-3.0.0.tar.bz2 for Unix ones, including Mac OS X. The only difference +wxWidgets-3.0.1.tar.bz2 for Unix ones, including Mac OS X. The only difference between these files is that the ZIP (and 7z) archives contain files with DOS line endings while the tar balls contain files with Unix line endings. +Note for the Windows users: please note that the installer installs *only* the +sources and you still need to compile the library before using it. See binaries +subdirectory for the pre-built binaries for the selected compilers. + Reporting Problems ------------------ @@ -24,13 +28,13 @@ or by posting to [wx-users mailing list](http://groups.google.com/group/wx-users Check Sums ---------- -To verify your download you can use the following sha1sums: +To verify your download please use the following sha1sums: - d19985b4ea4277ac7707615b7c00b15e3d58d2c0 wxWidgets-3.0.0.7z - 756a9c54d1f411e262f03bacb78ccef085a9880a wxWidgets-3.0.0.tar.bz2 - becf924bb06441bfd2e7f3f4bf4501e58ff5c7b8 wxWidgets-3.0.0.zip - 6950f26601f5b71f955803854b19dce22af5e020 wxWidgets-3.0.0-docs-html.tar.bz2 - b2909e17d19765cedf9d79793a78c3f7eda7d88b wxWidgets-3.0.0-docs-html.zip - bf0d8baa476baba8ac13442a6c9cd74c2f356993 wxWidgets-3.0.0-docs-chm.zip - 2f4f7013845930e069b4f3c5226d771eadee6986 wxWidgets-3.0.0_headers.7z - ff997beecf047ef9c94a1caccd9770300033c136 wxMSW-3.0.0-Setup.exe + e0ad42932fc8e9462d0a852086a1ecc97fae3a48 wxWidgets-3.0.1.7z + 73e58521d6871c9f4d1e7974c6e3a81629fddcf8 wxWidgets-3.0.1.tar.bz2 + e88ad739f3be41ae13ff5ef6b73b5d3a2bb5ee7f wxWidgets-3.0.1.zip + b070994dceff8e2db4263d8b0eab5b149e68e959 wxWidgets-3.0.1-docs-html.tar.bz2 + 2933c60e5ceca650cc9168066bf69e96b648ee96 wxWidgets-3.0.1-docs-html.zip + b13c987892392d2c204750f935efe0d1e28b8e0b wxWidgets-3.0.1-docs-chm.zip + f6beb163df207fbfba5caa1a485a8ed5d55978ea wxWidgets-3.0.1_headers.7z + 5bb83e64eac8a77a1e3a5157a0ff8a7ff4db4583 wxMSW-3.0.1-Setup.exe diff --git a/software/scsi2sd-util/wxWidgets/include/wx/app.h b/software/scsi2sd-util/wxWidgets/include/wx/app.h index 60e02b35..9a734695 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/app.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/app.h @@ -516,7 +516,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); }; -#if defined(__UNIX__) && !defined(__WXMSW__) +#if defined(__UNIX__) && !defined(__WINDOWS__) #include "wx/unix/app.h" #else // this has to be a class and not a typedef as we forward declare it diff --git a/software/scsi2sd-util/wxWidgets/include/wx/arrstr.h b/software/scsi2sd-util/wxWidgets/include/wx/arrstr.h index db67c8ef..f0351c16 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/arrstr.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/arrstr.h @@ -364,7 +364,10 @@ protected: void Copy(const wxArrayString& src); // copies the contents of another array private: - void Grow(size_t nIncrement = 0); // makes array bigger if needed + // Allocate the new buffer big enough to hold m_nCount + nIncrement items and + // return the pointer to the old buffer, which must be deleted by the caller + // (if the old buffer is big enough, just return NULL). + wxString *Grow(size_t nIncrement); size_t m_nSize, // current size of the array m_nCount; // current number of elements diff --git a/software/scsi2sd-util/wxWidgets/include/wx/bmpcbox.h b/software/scsi2sd-util/wxWidgets/include/wx/bmpcbox.h index dd695257..a5b9beee 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/bmpcbox.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/bmpcbox.h @@ -17,6 +17,7 @@ #if wxUSE_BITMAPCOMBOBOX #include "wx/bitmap.h" +#include "wx/dynarray.h" class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxItemContainer; diff --git a/software/scsi2sd-util/wxWidgets/include/wx/build.h b/software/scsi2sd-util/wxWidgets/include/wx/build.h index 0959a297..5be137b1 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/build.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/build.h @@ -54,13 +54,16 @@ #if defined(__GXX_ABI_VERSION) #define __WX_BO_COMPILER \ ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION) -#elif defined(__INTEL_COMPILER) - #define __WX_BO_COMPILER ",Intel C++" #elif defined(__GNUG__) #define __WX_BO_COMPILER ",GCC " \ __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) #elif defined(__VISUALC__) #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) +#elif defined(__INTEL_COMPILER) + // Notice that this must come after MSVC check as ICC under Windows is + // ABI-compatible with the corresponding version of the MSVC and we want to + // allow using it compile the application code using MSVC-built DLLs. + #define __WX_BO_COMPILER ",Intel C++" #elif defined(__BORLANDC__) #define __WX_BO_COMPILER ",Borland C++" #elif defined(__DIGITALMARS__) diff --git a/software/scsi2sd-util/wxWidgets/include/wx/compiler.h b/software/scsi2sd-util/wxWidgets/include/wx/compiler.h index de67477f..db8a7d36 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/compiler.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/compiler.h @@ -135,36 +135,8 @@ #endif /* - This macro can be used to check that the version of mingw32 CRT is at least - maj.min + wxCHECK_MINGW32_VERSION() is defined in wx/msw/gccpriv.h which is included + later, see comments there. */ -/* - Define Mingw identification symbols, wxCHECK_MINGW32_VERSION() is defined in - wx/msw/gccpriv.h which is included later, see comments there. - */ -#ifdef __MINGW32__ -/* - MinGW-w64 project provides compilers for both Win32 and Win64 but only - defines the same __MINGW32__ symbol for the former as MinGW32 toolchain - which is quite different (notably doesn't provide many SDK headers that - MinGW-w64 does include). So we define a separate symbol which, unlike the - predefined __MINGW64__, can be used to detect this toolchain in both 32 and - 64 bit builds. - - And define __MINGW32_TOOLCHAIN__ for consistency and also because it's - convenient as we often want to have some workarounds only for the (old) - MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__. - */ -# ifdef __MINGW64_VERSION_MAJOR -# ifndef __MINGW64_TOOLCHAIN__ -# define __MINGW64_TOOLCHAIN__ -# endif -# else -# ifndef __MINGW32_TOOLCHAIN__ -# define __MINGW32_TOOLCHAIN__ -# endif -# endif -#endif - #endif // _WX_COMPILER_H_ diff --git a/software/scsi2sd-util/wxWidgets/include/wx/defs.h b/software/scsi2sd-util/wxWidgets/include/wx/defs.h index 6dc716a6..397ddd70 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/defs.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/defs.h @@ -216,7 +216,7 @@ /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */ /* when using Windows sockets. */ -#if defined(__CYGWIN__) && defined(__WXMSW__) +#if defined(__CYGWIN__) && defined(__WINDOWS__) #define __USE_W32_SOCKETS #endif diff --git a/software/scsi2sd-util/wxWidgets/include/wx/filefn.h b/software/scsi2sd-util/wxWidgets/include/wx/filefn.h index 95b3051c..4815807f 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/filefn.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/filefn.h @@ -188,7 +188,7 @@ enum wxPosixPermissions #elif (defined(__WINDOWS__) || defined(__OS2__)) && \ ( \ defined(__VISUALC__) || \ - defined(__MINGW64__) || \ + defined(__MINGW64_TOOLCHAIN__) || \ (defined(__MINGW32__) && !defined(__WINE__) && \ wxCHECK_W32API_VERSION(0, 5)) || \ defined(__DMC__) || \ @@ -203,8 +203,8 @@ enum wxPosixPermissions // detect compilers which have support for huge files #if defined(__VISUALC__) #define wxHAS_HUGE_FILES 1 - #elif defined(__MINGW32__) || defined(__MINGW64__) - #define wxHAS_HUGE_FILES 1f + #elif defined(__MINGW32__) + #define wxHAS_HUGE_FILES 1 #elif defined(_LARGE_FILES) #define wxHAS_HUGE_FILES 1 #endif @@ -281,7 +281,7 @@ enum wxPosixPermissions // to avoid using them as they're not present in earlier versions and // always using the native functions spelling is easier than testing for // the versions - #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__) + #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64_TOOLCHAIN__) #define wxPOSIX_IDENT(func) ::func #else // by default assume MSVC-compatible names #define wxPOSIX_IDENT(func) _ ## func @@ -296,7 +296,7 @@ enum wxPosixPermissions #define wxWrite wxPOSIX_IDENT(write) #ifdef wxHAS_HUGE_FILES - #ifndef __MINGW64__ + #ifndef __MINGW64_TOOLCHAIN__ #define wxSeek wxPOSIX_IDENT(lseeki64) #define wxLseek wxPOSIX_IDENT(lseeki64) #define wxTell wxPOSIX_IDENT(telli64) @@ -337,7 +337,7 @@ enum wxPosixPermissions #ifdef wxHAS_HUGE_FILES // MinGW-64 provides underscore-less versions of all file functions // except for this one. - #ifdef __MINGW64__ + #ifdef __MINGW64_TOOLCHAIN__ #define wxCRT_StatA _stati64 #else #define wxCRT_StatA wxPOSIX_IDENT(stati64) diff --git a/software/scsi2sd-util/wxWidgets/include/wx/generic/listctrl.h b/software/scsi2sd-util/wxWidgets/include/wx/generic/listctrl.h index 7e18eecc..a7bdebf6 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/generic/listctrl.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/generic/listctrl.h @@ -120,6 +120,12 @@ public: wxTextCtrl *EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); + + // End label editing, optionally cancelling the edit +#if wxABI_VERSION >= 30002 + bool EndEditLabel(bool cancel); +#endif + wxTextCtrl* GetEditControl() const; void Edit( long item ) { EditLabel(item); } diff --git a/software/scsi2sd-util/wxWidgets/include/wx/generic/private/listctrl.h b/software/scsi2sd-util/wxWidgets/include/wx/generic/private/listctrl.h index 32afaada..5cd210f4 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/generic/private/listctrl.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/generic/private/listctrl.h @@ -564,6 +564,9 @@ public: // start editing the label of the given item wxTextCtrl *EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl)); + + bool EndEditLabel(bool cancel); + wxTextCtrl *GetEditControl() const { return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL; diff --git a/software/scsi2sd-util/wxWidgets/include/wx/generic/richmsgdlgg.h b/software/scsi2sd-util/wxWidgets/include/wx/generic/richmsgdlgg.h index 5446f87f..9384dbb8 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/generic/richmsgdlgg.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/generic/richmsgdlgg.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_CORE wxGenericRichMessageDialog public: wxGenericRichMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption, - long style) + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK | wxCENTRE) : wxRichMessageDialogBase( parent, message, caption, style ), m_checkBox(NULL), m_detailsPane(NULL) diff --git a/software/scsi2sd-util/wxWidgets/include/wx/generic/srchctlg.h b/software/scsi2sd-util/wxWidgets/include/wx/generic/srchctlg.h index c61ddee7..4eaa8e1c 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/generic/srchctlg.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/generic/srchctlg.h @@ -238,6 +238,9 @@ private: // Implement pure virtual function inherited from wxCompositeWindow. virtual wxWindowList GetCompositeWindowParts() const; + // Position the child controls using the current window size. + void DoLayoutControls(); + #if wxUSE_MENUS void PopupSearchMenu(); #endif // wxUSE_MENUS diff --git a/software/scsi2sd-util/wxWidgets/include/wx/language.h b/software/scsi2sd-util/wxWidgets/include/wx/language.h index 3324ef07..bb8a13e5 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/language.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/language.h @@ -149,7 +149,6 @@ enum wxLanguage wxLANGUAGE_ITALIAN_SWISS, wxLANGUAGE_JAPANESE, wxLANGUAGE_JAVANESE, - wxLANGUAGE_KABYLE, wxLANGUAGE_KANNADA, wxLANGUAGE_KASHMIRI, wxLANGUAGE_KASHMIRI_INDIA, @@ -270,6 +269,7 @@ enum wxLanguage wxLANGUAGE_YORUBA, wxLANGUAGE_ZHUANG, wxLANGUAGE_ZULU, + wxLANGUAGE_KABYLE, /// For custom, user-defined languages. wxLANGUAGE_USER_DEFINED diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/bitmap.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/bitmap.h index c677af8c..47d638a1 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/bitmap.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/bitmap.h @@ -183,6 +183,10 @@ public: // implementation only from now on // ------------------------------- + // Set alpha flag to true if this is a 32bpp bitmap which has any non-0 + // values in its alpha channel. + void MSWUpdateAlpha(); + public: void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); } WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); } diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/gccpriv.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/gccpriv.h index 4bebc120..c1962799 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/gccpriv.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/gccpriv.h @@ -35,6 +35,28 @@ #include <_mingw.h> + /* + MinGW-w64 project provides compilers for both Win32 and Win64 but only + defines the same __MINGW32__ symbol for the former as MinGW32 toolchain + which is quite different (notably doesn't provide many SDK headers that + MinGW-w64 does include). So we define a separate symbol which, unlike + the predefined __MINGW64__, can be used to detect this toolchain in + both 32 and 64 bit builds. + + And define __MINGW32_TOOLCHAIN__ for consistency and also because it's + convenient as we often want to have some workarounds only for the (old) + MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__. + */ + #ifdef __MINGW64_VERSION_MAJOR + #ifndef __MINGW64_TOOLCHAIN__ + #define __MINGW64_TOOLCHAIN__ + #endif + #else + #ifndef __MINGW32_TOOLCHAIN__ + #define __MINGW32_TOOLCHAIN__ + #endif + #endif + #define wxCHECK_MINGW32_VERSION( major, minor ) \ ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \ || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) ) diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/menu.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/menu.h index 5f4c9f18..616b3044 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/menu.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/menu.h @@ -67,6 +67,11 @@ public: // menu handle and will delete it when this object is destroyed. static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); } +#if wxABI_VERSION >= 30002 + // Detaches HMENU so that it isn't deleted when this object is destroyed. + // Don't use this object after calling this method. + WXHMENU MSWDetachHMENU() { WXHMENU m = m_hMenu; m_hMenu = NULL; return m; } +#endif // implementation only from now on // ------------------------------- diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/menuitem.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/menuitem.h index d76bd119..7e6eacd1 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/menuitem.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/menuitem.h @@ -133,6 +133,11 @@ private: // common part of all ctors void Init(); + // Return the item position in the menu containing it. + // + // Returns -1 if the item is not attached to a menu or if we can't find its + // position (which is not really supposed to ever happen). + int MSGetMenuItemPos() const; #if wxUSE_OWNER_DRAWN // item bitmaps diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/ole/oleutils.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/ole/oleutils.h index c9f7eb88..ed37b2ad 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/ole/oleutils.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/ole/oleutils.h @@ -21,6 +21,7 @@ #include #include "wx/intl.h" #include "wx/log.h" +#include "wx/variant.h" // ============================================================================ // General purpose functions and macros @@ -354,4 +355,30 @@ inline void wxOleUninitialize() { } #endif // wxUSE_OLE/!wxUSE_OLE +// RAII class initializing OLE in its ctor and undoing it in its dtor. +class wxOleInitializer +{ +public: + wxOleInitializer() + : m_ok(wxOleInitialize()) + { + } + + bool IsOk() const + { + return m_ok; + } + + ~wxOleInitializer() + { + if ( m_ok ) + wxOleUninitialize(); + } + +private: + const bool m_ok; + + wxDECLARE_NO_COPY_CLASS(wxOleInitializer); +}; + #endif //_WX_OLEUTILS_H diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/richmsgdlg.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/richmsgdlg.h index 20c8eb72..51cdc632 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/richmsgdlg.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/richmsgdlg.h @@ -15,8 +15,8 @@ class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog public: wxRichMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption, - long style) + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK | wxCENTRE) : wxGenericRichMessageDialog(parent, message, caption, style) { } diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/textctrl.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/textctrl.h index 1a81e44d..66950aa4 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/textctrl.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/textctrl.h @@ -170,6 +170,13 @@ public: // EDIT control has one already) void OnContextMenu(wxContextMenuEvent& event); +#if wxABI_VERSION >= 30002 + // Create context menu for RICHEDIT controls. This may be called once during + // the control's lifetime or every time the menu is shown, depending on + // implementation. + wxMenu *MSWCreateContextMenu(); +#endif + // be sure the caret remains invisible if the user // called HideNativeCaret() before void OnSetFocus(wxFocusEvent& event); diff --git a/software/scsi2sd-util/wxWidgets/include/wx/msw/window.h b/software/scsi2sd-util/wxWidgets/include/wx/msw/window.h index bd793e14..68ed5831 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/msw/window.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/msw/window.h @@ -682,6 +682,13 @@ private: bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags); bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); +#ifndef __WXUNIVERSAL__ + // Call ::IsDialogMessage() if it is safe to do it (i.e. if it's not going + // to hang or do something else stupid) with the given message, return true + // if the message was handled by it. + bool MSWSafeIsDialogMessage(WXMSG* msg); +#endif // __WXUNIVERSAL__ + #if wxUSE_DEFERRED_SIZING protected: // this function is called after the window was resized to its new size diff --git a/software/scsi2sd-util/wxWidgets/include/wx/osx/config_xcode.h b/software/scsi2sd-util/wxWidgets/include/wx/osx/config_xcode.h index 1acc549e..627dad44 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/osx/config_xcode.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/osx/config_xcode.h @@ -125,9 +125,9 @@ #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 3.0.1" +#define PACKAGE_STRING "wxWidgets 3.0.2" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "3.0.1" +#define PACKAGE_VERSION "3.0.2" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/software/scsi2sd-util/wxWidgets/include/wx/private/pipestream.h b/software/scsi2sd-util/wxWidgets/include/wx/private/pipestream.h index f14d9aba..7fdcb717 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/private/pipestream.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/private/pipestream.h @@ -20,7 +20,7 @@ // IsOpened() method. // // wxPipeOutputStream is similar but has no additional methods at all. -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WINDOWS__) #include "wx/unix/private/pipestream.h" #elif defined(__WINDOWS__) && !defined(__WXWINCE__) #include "wx/msw/private/pipestream.h" diff --git a/software/scsi2sd-util/wxWidgets/include/wx/richmsgdlg.h b/software/scsi2sd-util/wxWidgets/include/wx/richmsgdlg.h index 1fbc9642..ab49af7d 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/richmsgdlg.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/richmsgdlg.h @@ -73,8 +73,8 @@ private: public: wxRichMessageDialog( wxWindow *parent, const wxString& message, - const wxString& caption, - long style ) + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK | wxCENTRE ) : wxGenericRichMessageDialog( parent, message, caption, style ) { } diff --git a/software/scsi2sd-util/wxWidgets/include/wx/simplebook.h b/software/scsi2sd-util/wxWidgets/include/wx/simplebook.h index 5ca253ac..78cc8721 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/simplebook.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/simplebook.h @@ -41,6 +41,16 @@ public: Init(); } + bool Create(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxEmptyString) + { + return wxBookCtrlBase::Create(parent, winid, pos, size, style | wxBK_TOP, name); + } + // Methods specific to this class. diff --git a/software/scsi2sd-util/wxWidgets/include/wx/version.h b/software/scsi2sd-util/wxWidgets/include/wx/version.h index 1e33fb4d..c1c438d2 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/version.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/version.h @@ -27,9 +27,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 3 #define wxMINOR_VERSION 0 -#define wxRELEASE_NUMBER 1 +#define wxRELEASE_NUMBER 2 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.0.1") +#define wxVERSION_STRING wxT("wxWidgets 3.0.2") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_all.h b/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_all.h index 0afe3dbb..b532f3f2 100644 --- a/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_all.h +++ b/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_all.h @@ -56,6 +56,7 @@ #include "wx/xrc/xh_radbx.h" #include "wx/xrc/xh_scrol.h" #include "wx/xrc/xh_scwin.h" +#include "wx/xrc/xh_simplebook.h" #include "wx/xrc/xh_sizer.h" #include "wx/xrc/xh_slidr.h" #include "wx/xrc/xh_spin.h" diff --git a/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_simplebook.h b/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_simplebook.h new file mode 100644 index 00000000..cf4ddd08 --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/include/wx/xrc/xh_simplebook.h @@ -0,0 +1,36 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/xrc/xh_simplebook.h +// Purpose: XML resource handler for wxSimplebook +// Author: Vadim Zeitlin +// Created: 2014-08-05 +// Copyright: (c) 2014 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_SIMPLEBOOK_H_ +#define _WX_XH_SIMPLEBOOK_H_ + +#include "wx/xrc/xmlres.h" + +#if wxUSE_XRC && wxUSE_BOOKCTRL + +class wxSimplebook; + +class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler +{ +public: + wxSimplebookXmlHandler(); + + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); + +private: + bool m_isInside; + wxSimplebook *m_simplebook; + + wxDECLARE_DYNAMIC_CLASS(wxSimplebookXmlHandler); +}; + +#endif // wxUSE_XRC && wxUSE_BOOKCTRL + +#endif // _WX_XH_SIMPLEBOOK_H_ diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/datetime.h b/software/scsi2sd-util/wxWidgets/interface/wx/datetime.h index f7f19069..e8d43ec2 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/datetime.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/datetime.h @@ -799,6 +799,10 @@ public: function (http://www.cplusplus.com/reference/clibrary/ctime/strftime.html). Please see its description for the meaning of @a format parameter. + Notice that POSIX @c "%g", @c "%G", @c "%V" and @c "%z" format + specifiers are supported even if the standard library doesn't support + them (e.g. MSVC). + It also accepts a few wxWidgets-specific extensions: you can optionally specify the width of the field to follow using @c printf(3)-like syntax and the format specification @c "%l" can be used to get the number of diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/dialog.h b/software/scsi2sd-util/wxWidgets/interface/wx/dialog.h index 5607585e..286a52ae 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/dialog.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/dialog.h @@ -495,6 +495,11 @@ public: @a id is wxID_NONE meaning that @c ESC presses should be ignored. If any other value is given, it is interpreted as the id of the button to map the escape key to. + + @note This method should be used for custom modal dialog implemented in + wxWidgets itself, native dialogs such as wxMessageDialog or + wxFileDialog, handle @c ESC presses in their own way which cannot be + customized. */ void SetEscapeId(int id); diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/graphics.h b/software/scsi2sd-util/wxWidgets/interface/wx/graphics.h index 13dbf446..1e971b4e 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/graphics.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/graphics.h @@ -1067,6 +1067,9 @@ public: @a bitmap meaning is platform-dependent. Currently it's a GDI+ @c Bitmap pointer under MSW, @c CGImage pointer under OS X or a @c cairo_surface_t pointer when using Cairo under any platform. + + Notice that this method takes ownership of @a bitmap, i.e. it will be + destroyed when the returned wxGraphicsBitmap is. */ virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) = 0; diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/language.h b/software/scsi2sd-util/wxWidgets/interface/wx/language.h index 1c9624b5..d1ef5da0 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/language.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/language.h @@ -16,7 +16,7 @@ */ enum wxLanguage { - /// User's default/preferred language as got from OS. + /// User's default/preffered language as got from OS. wxLANGUAGE_DEFAULT, /// Unknown language, returned if wxLocale::GetSystemLanguage fails. @@ -254,6 +254,7 @@ enum wxLanguage wxLANGUAGE_YORUBA, wxLANGUAGE_ZHUANG, wxLANGUAGE_ZULU, + wxLANGUAGE_KABYLE, /// For custom, user-defined languages. wxLANGUAGE_USER_DEFINED diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/listctrl.h b/software/scsi2sd-util/wxWidgets/interface/wx/listctrl.h index 11af37f5..b08b7141 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/listctrl.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/listctrl.h @@ -457,7 +457,7 @@ public: @param cancel If @true, discard the changes made by user, as if @c Escape key was pressed. Otherwise, accept the changes as if @c Return was pressed. - @return @true if item editing wad finished or @false if no item as + @return @true if item editing was finished or @false if no item as being edited. */ bool EndEditLabel(bool cancel); diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/mimetype.h b/software/scsi2sd-util/wxWidgets/interface/wx/mimetype.h index 79c9c713..7fafbf0f 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/mimetype.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/mimetype.h @@ -323,16 +323,12 @@ public: /** If the function returns @true, the @c iconLoc is filled with the location of the icon for this MIME type. - A wxIcon may be created from @a iconLoc later. - - @b Windows: The function returns the icon shown by Explorer for the files of - the specified type. - @b Mac: This function is not implemented and always returns @false. + A wxIcon may be created from @a iconLoc later. - @b Unix: MIME manager gathers information about icons from GNOME - and KDE settings and thus GetIcon's success depends on availability - of these desktop environments. + \note Under Unix MIME manager gathers information about icons from + GNOME and KDE settings and thus GetIcon's success depends on + availability of these desktop environments. */ bool GetIcon(wxIconLocation* iconLoc) const; diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/simplebook.h b/software/scsi2sd-util/wxWidgets/interface/wx/simplebook.h index b0ae8794..838a9034 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/simplebook.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/simplebook.h @@ -43,8 +43,7 @@ public: /** Default constructor. - Use Create() (inherited from the base class) later to really create the - control. + Use Create() later to really create the control. */ wxSimplebook(); @@ -58,6 +57,18 @@ public: long style = 0, const wxString& name = wxEmptyString); + /** + Really create the window of an object created using default + constructor. + + @since 3.0.2 + */ + bool Create(wxWindow* parent, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxEmptyString); /** Set the effects to use for showing and hiding the pages. diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/slider.h b/software/scsi2sd-util/wxWidgets/interface/wx/slider.h index 3a1bae6a..b97122ba 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/slider.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/slider.h @@ -30,7 +30,10 @@ On Windows, the track bar control is used. - Slider events are handled in the same way as a scrollbar. + Slider generates the same events as wxScrollBar but in practice the most + convenient way to process wxSlider updates is by handling the + slider-specific @c wxEVT_SLIDER event which carries wxCommandEvent + containing just the latest slider position. @beginStyleTable @style{wxSL_HORIZONTAL} @@ -118,6 +121,8 @@ @event{EVT_SLIDER(id, func)} Process @c wxEVT_SLIDER which is generated after any change of wxSlider position in addition to one of the events above. + Notice that the handler of this event receives a wxCommandEvent as + argument and not wxScrollEvent, as all the other handlers. @endEventTable @section slider_diff The difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/stdpaths.h b/software/scsi2sd-util/wxWidgets/interface/wx/stdpaths.h index 2c49a2f5..c0592e5c 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/stdpaths.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/stdpaths.h @@ -97,8 +97,6 @@ public: - Mac: @c ~/Documents/appinfo @since 2.9.0 - - @see GetAppDocumentsDir() */ virtual wxString GetAppDocumentsDir() const; diff --git a/software/scsi2sd-util/wxWidgets/interface/wx/treectrl.h b/software/scsi2sd-util/wxWidgets/interface/wx/treectrl.h index 2b1f1cae..c25ec388 100644 --- a/software/scsi2sd-util/wxWidgets/interface/wx/treectrl.h +++ b/software/scsi2sd-util/wxWidgets/interface/wx/treectrl.h @@ -223,7 +223,7 @@ public: The @a image and @a selImage parameters are an index within the normal image list specifying the image to use for unselected and selected - items, respectively. If @a image -1 and @a selImage is -1, the same + items, respectively. If @a image > -1 and @a selImage is -1, the same image is used for both selected and unselected items. */ wxTreeItemId AppendItem(const wxTreeItemId& parent, diff --git a/software/scsi2sd-util/wxWidgets/misc/languages/langtabl.txt b/software/scsi2sd-util/wxWidgets/misc/languages/langtabl.txt index 6d1656e3..5efd76a2 100644 --- a/software/scsi2sd-util/wxWidgets/misc/languages/langtabl.txt +++ b/software/scsi2sd-util/wxWidgets/misc/languages/langtabl.txt @@ -232,3 +232,4 @@ wxLANGUAGE_YIDDISH yi - - wxLANGUAGE_YORUBA yo - - LTR "Yoruba" wxLANGUAGE_ZHUANG za - - LTR "Zhuang" wxLANGUAGE_ZULU zu - - LTR "Zulu" +wxLANGUAGE_KABYLE kab LANG_KABYLE SUBLANG_DEFAULT LTR "Kabyle" diff --git a/software/scsi2sd-util/wxWidgets/misc/schema/xrc_schema.rnc b/software/scsi2sd-util/wxWidgets/misc/schema/xrc_schema.rnc index 5752b623..06b1a111 100644 --- a/software/scsi2sd-util/wxWidgets/misc/schema/xrc_schema.rnc +++ b/software/scsi2sd-util/wxWidgets/misc/schema/xrc_schema.rnc @@ -202,6 +202,7 @@ builtinWindowClasses = | wxScrollBar | wxScrolledWindow | wxSimpleHtmlListBox + | wxSimplebook | wxSlider | wxSpinButton | wxSpinCtrl @@ -290,6 +291,7 @@ builtinClassesNames = | "wxScrollBar" | "wxScrolledWindow" | "wxSimpleHtmlListBox" + | "wxSimplebook" | "wxSlider" | "wxSpinButton" | "wxSpinCtrl" @@ -329,6 +331,7 @@ builtinNestedClassesNames = | "notebookpage" | "choicebookpage" | "listbookpage" + | "simplebookpage" | "treebookpage" | "propertysheetpage" | "ownerdrawnitem" @@ -392,6 +395,7 @@ stdWindowProperties = [xrc:p="o"] element focused {_, t_bool }* & [xrc:p="o"] element hidden {_, t_bool }* & [xrc:p="o"] element tooltip {_, t_text }* & + [xrc:p="o"] element variant {_, t_variant }* & [xrc:p="o"] element font {_, t_font }* & [xrc:p="o"] element ownfont {_, t_font }* & [xrc:p="o"] element help {_, t_text }* @@ -447,6 +451,8 @@ t_font = ( [xrc:p="o"] element relativesize {_, t_float }* ) +t_variant = "normal" | "small" | "mini" | "large" + t_imagelist = ( [xrc:p="o"] element mask {_, t_bool }* & [xrc:p="o"] element size {_, t_size }* & @@ -1199,8 +1205,7 @@ wxRichTextCtrl = stdObjectNodeAttributes & stdWindowProperties & [xrc:p="o"] element value {_, t_text }* & - [xrc:p="o"] element maxlength {_, t_integer }* & - [xrc:p="o"] element hint {_, t_text }* + [xrc:p="o"] element maxlength {_, t_integer }* } @@ -1239,6 +1244,24 @@ wxSimpleHtmlListBox = } +wxSimplebook = + element object { + attribute class { "wxSimplebook" } & + stdObjectNodeAttributes & + stdWindowProperties & + (wxSimplebook_simplebookpage | objectRef)* + } + +wxSimplebook_simplebookpage = + element object { + attribute class { "simplebookpage" } & + platform & + element label {_, t_text }* & + [xrc:p="o"] element selected {_, t_bool }* & + windowNode + } + + wxSlider = element object { attribute class { "wxSlider" } & @@ -1355,7 +1378,8 @@ wxTextCtrl = stdObjectNodeAttributes & stdWindowProperties & [xrc:p="o"] element value {_, t_text }* & - [xrc:p="o"] element maxlength {_, t_integer }* + [xrc:p="o"] element maxlength {_, t_integer }* & + [xrc:p="o"] element hint {_, t_text }* } diff --git a/software/scsi2sd-util/wxWidgets/samples/Info.plist b/software/scsi2sd-util/wxWidgets/samples/Info.plist index f0291d71..0b69400d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/Info.plist +++ b/software/scsi2sd-util/wxWidgets/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.0.1, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 3.0.2, (c) 2005-2011 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 3.0.1, (c) 2005-2011 wxWidgets + 3.0.2, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.0.1 + 3.0.2 CFBundleSignature ???? CFBundleVersion - 3.0.1 + 3.0.2 CSResourcesFileMapped LSRequiresCarbon diff --git a/software/scsi2sd-util/wxWidgets/samples/access/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/access/Makefile.in index f95ab51d..988537ba 100644 --- a/software/scsi2sd-util/wxWidgets/samples/access/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/access/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/access/access_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/access/access_vc8.vcproj index 7470fb19..f9c09e57 100644 --- a/software/scsi2sd-util/wxWidgets/samples/access/access_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/access/access_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/access/access_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/access/access_vc9.vcproj index 62e73db0..520b8eb9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/access/access_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/access/access_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/animate/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/animate/Makefile.in index a3977622..b107fff5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/animate/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/animate/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc8.vcproj index b5fbf094..8ee5bd02 100644 --- a/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc9.vcproj index 2e928f64..40c27e72 100644 --- a/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/animate/anitest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/artprov/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/artprov/Makefile.in index b357381c..87f145cd 100644 --- a/software/scsi2sd-util/wxWidgets/samples/artprov/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/artprov/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc8.vcproj index 30743a17..0bbc7435 100644 --- a/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc9.vcproj index 6dd79008..3551bb20 100644 --- a/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/artprov/artprov_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/aui/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/aui/Makefile.in index 2659a3a1..c58581de 100644 --- a/software/scsi2sd-util/wxWidgets/samples/aui/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/aui/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc8.vcproj index 200f6480..9fa8bb45 100644 --- a/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc9.vcproj index 76f05c12..19eb8f09 100644 --- a/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/aui/auidemo_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/calendar/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/calendar/Makefile.in index 994a5825..da72015b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/calendar/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/calendar/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc8.vcproj index d222c73d..a4baa821 100644 --- a/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc9.vcproj index cc8f8f43..a2b9b246 100644 --- a/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/calendar/calendar_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/caret/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/caret/Makefile.in index 24ca2033..25bb13ec 100644 --- a/software/scsi2sd-util/wxWidgets/samples/caret/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/caret/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc8.vcproj index 8bb7ada2..0a1bb23d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc9.vcproj index 5070f23b..18cb41d7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/caret/caret_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/clipboard/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/clipboard/Makefile.in index ce046425..1c2a2659 100644 --- a/software/scsi2sd-util/wxWidgets/samples/clipboard/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/clipboard/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc8.vcproj index 69be01d8..5b53d44a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc9.vcproj index 7accb7aa..a26c54f5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/clipboard/clipboard_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/collpane/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/collpane/Makefile.in index c071a6ed..cdbf9da9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/collpane/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/collpane/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc8.vcproj index 4c810998..05f8c5c7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc9.vcproj index 8594609f..8569e17e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/collpane/collpane_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/combo/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/combo/Makefile.in index 98aad6c2..6de5c0c5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/combo/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/combo/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc8.vcproj index 4ed972c5..ee68dd05 100644 --- a/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc9.vcproj index 1658c224..62b8de32 100644 --- a/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/combo/combo_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/config/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/config/Makefile.in index c80964da..2dd834a6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/config/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/config/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/config/config_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/config/config_vc8.vcproj index 29ffbacc..5c61afae 100644 --- a/software/scsi2sd-util/wxWidgets/samples/config/config_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/config/config_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/config/config_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/config/config_vc9.vcproj index 6fbd8a12..fe17c769 100644 --- a/software/scsi2sd-util/wxWidgets/samples/config/config_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/config/config_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/console/console_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/console/console_vc8.vcproj index 866eda2a..06913010 100644 --- a/software/scsi2sd-util/wxWidgets/samples/console/console_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/console/console_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/console/console_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/console/console_vc9.vcproj index 3ead0fb5..9fd45fe9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/console/console_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/console/console_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/controls/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/controls/Makefile.in index 7e0ab61e..052227df 100644 --- a/software/scsi2sd-util/wxWidgets/samples/controls/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/controls/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc8.vcproj index c55e8cf2..01974f29 100644 --- a/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc9.vcproj index 6deacd62..c413bf38 100644 --- a/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/controls/controls_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dataview/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/dataview/Makefile.in index 53f586cc..20d349ae 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dataview/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/dataview/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc8.vcproj index bae39280..5c0241d6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc9.vcproj index d1799958..ed0c3c1b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dataview/dataview_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/debugrpt/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/debugrpt/Makefile.in index a6e9a9cd..141c7daa 100644 --- a/software/scsi2sd-util/wxWidgets/samples/debugrpt/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/debugrpt/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc8.vcproj index a488abea..289761b8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc9.vcproj index a614e12f..0a69297c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/debugrpt/debugrpt_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dialogs/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/dialogs/Makefile.in index 76c74920..24a6526f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dialogs/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/dialogs/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/dialogs/dialogs_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/dialogs/dialogs_vc8.vcproj index 632e2dfb..0cb9f34b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dialogs/dialogs_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dialogs/dialogs_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -428,6 +817,14 @@ Name="DLL Release|Win32" ExcludedFromBuild="true" /> + + + + + + + + + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -414,6 +789,14 @@ Name="DLL Release|Win32" ExcludedFromBuild="true" /> + + + + + + + + + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dialup/dialup_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/dialup/dialup_vc9.vcproj index 168423e2..fcb441bf 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dialup/dialup_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dialup/dialup_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/display/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/display/Makefile.in index ac5e490b..b41ae8b3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/display/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/display/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/display/display_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/display/display_vc8.vcproj index d6b6cc14..df12f546 100644 --- a/software/scsi2sd-util/wxWidgets/samples/display/display_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/display/display_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/display/display_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/display/display_vc9.vcproj index 891e3908..f7fa82be 100644 --- a/software/scsi2sd-util/wxWidgets/samples/display/display_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/display/display_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/dll/Makefile.in index 49412bef..6e888db6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/dll/Makefile.in @@ -47,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_my_dll.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_my_dll.vcproj index 0bfac8f2..59bb8305 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_my_dll.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_my_dll.vcproj @@ -16,6 +16,9 @@ + @@ -383,6 +386,368 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_sdk_exe.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_sdk_exe.vcproj index f35150a4..a30193eb 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_sdk_exe.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_sdk_exe.vcproj @@ -16,6 +16,9 @@ + @@ -403,6 +406,388 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_wx_exe.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_wx_exe.vcproj index 0870e058..e7c90dab 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_wx_exe.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc8_wx_exe.vcproj @@ -16,6 +16,9 @@ + @@ -214,6 +217,199 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_my_dll.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_my_dll.vcproj index c8777a08..7cdd204e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_my_dll.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_my_dll.vcproj @@ -16,6 +16,9 @@ + @@ -381,6 +384,366 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_sdk_exe.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_sdk_exe.vcproj index b21de75b..b4aab644 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_sdk_exe.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_sdk_exe.vcproj @@ -16,6 +16,9 @@ + @@ -389,6 +392,374 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_wx_exe.vcproj b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_wx_exe.vcproj index 466cde4f..33088ab5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_wx_exe.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dll/dll_vc9_wx_exe.vcproj @@ -16,6 +16,9 @@ + @@ -207,6 +210,192 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dnd/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/dnd/Makefile.in index bc0bb5f5..73750c41 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dnd/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/dnd/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc8.vcproj index 8aa8d5fd..ad5fe371 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc9.vcproj index 541d075e..4e9d37c3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dnd/dnd_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/docview/Info.plist b/software/scsi2sd-util/wxWidgets/samples/docview/Info.plist index bd4443f7..f6377427 100644 --- a/software/scsi2sd-util/wxWidgets/samples/docview/Info.plist +++ b/software/scsi2sd-util/wxWidgets/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.0.1, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 3.0.2, (c) 2005-2011 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,17 +66,17 @@ it CFBundleLongVersionString - 3.0.1, (c) 2005-2011 wxWidgets + 3.0.2, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.0.1 + 3.0.2 CFBundleSignature WXMA CFBundleVersion - 3.0.1 + 3.0.2 CSResourcesFileMapped LSRequiresCarbon diff --git a/software/scsi2sd-util/wxWidgets/samples/docview/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/docview/Makefile.in index 2f1ea39d..1cd0cbde 100644 --- a/software/scsi2sd-util/wxWidgets/samples/docview/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/docview/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc8.vcproj index cce094e9..dc0e0cf8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc9.vcproj index 7c10f686..d0f51540 100644 --- a/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/docview/docview_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dragimag/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/dragimag/Makefile.in index 35e08abf..c46fde6f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dragimag/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/dragimag/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc8.vcproj index fa72fb2d..7926597f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc9.vcproj index a992162a..f61f47cd 100644 --- a/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/dragimag/dragimag_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/drawing/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/drawing/Makefile.in index 90d4193c..74581b63 100644 --- a/software/scsi2sd-util/wxWidgets/samples/drawing/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/drawing/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc8.vcproj index 6d592641..090ce9ea 100644 --- a/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc9.vcproj index e2dd8d31..04dc7b4b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/drawing/drawing_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/erase/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/erase/Makefile.in index 906a232c..d6eef542 100644 --- a/software/scsi2sd-util/wxWidgets/samples/erase/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/erase/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc8.vcproj index 44f1bfec..b29dcfbf 100644 --- a/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc9.vcproj index 4849c4db..2333b3a9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/erase/erase_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/event/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/event/Makefile.in index 4e8303c4..55835537 100644 --- a/software/scsi2sd-util/wxWidgets/samples/event/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/event/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/event/event_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/event/event_vc8.vcproj index ea739c8d..2a0f73c7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/event/event_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/event/event_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/event/event_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/event/event_vc9.vcproj index 9c6fb8df..c541f7f7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/event/event_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/event/event_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/except/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/except/Makefile.in index 8c31019f..e361ffa5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/except/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/except/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/except/except_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/except/except_vc8.vcproj index ce2426c5..c11e5209 100644 --- a/software/scsi2sd-util/wxWidgets/samples/except/except_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/except/except_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/except/except_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/except/except_vc9.vcproj index 5a059b54..d908b92c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/except/except_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/except/except_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/exec/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/exec/Makefile.in index c216b8c3..fb76fdce 100644 --- a/software/scsi2sd-util/wxWidgets/samples/exec/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/exec/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc8.vcproj index 47ca9a8f..dd8084df 100644 --- a/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc9.vcproj index 5a5983bd..bc06169a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/exec/exec_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc8.vcproj index cf057212..4358d4f3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc9.vcproj index 78bfaf3f..74183760 100644 --- a/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/flash/flash_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/font/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/font/Makefile.in index 3e1cb0e5..050efee0 100644 --- a/software/scsi2sd-util/wxWidgets/samples/font/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/font/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/font/font.cpp b/software/scsi2sd-util/wxWidgets/samples/font/font.cpp index cc9476a9..1a9891be 100644 --- a/software/scsi2sd-util/wxWidgets/samples/font/font.cpp +++ b/software/scsi2sd-util/wxWidgets/samples/font/font.cpp @@ -109,6 +109,7 @@ public: void OnStrikethrough(wxCommandEvent& event); void OnwxPointerFont(wxCommandEvent& event); + void OnFontDefault(wxCommandEvent& event); void OnwxSystemSettingsFont(wxCommandEvent& event); void OnTestTextValue(wxCommandEvent& event); @@ -185,6 +186,7 @@ enum Font_wxSMALL_FONT, Font_wxITALIC_FONT, Font_wxSWISS_FONT, + Font_wxFont_Default, Font_Standard, // wxSystemSettings::GetFont possible objects: @@ -238,6 +240,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_wxSMALL_FONT, MyFrame::OnwxPointerFont) EVT_MENU(Font_wxITALIC_FONT, MyFrame::OnwxPointerFont) EVT_MENU(Font_wxSWISS_FONT, MyFrame::OnwxPointerFont) + EVT_MENU(Font_wxFont_Default, MyFrame::OnFontDefault) EVT_MENU(Font_wxSYS_OEM_FIXED_FONT, MyFrame::OnwxSystemSettingsFont) EVT_MENU(Font_wxSYS_ANSI_FIXED_FONT, MyFrame::OnwxSystemSettingsFont) @@ -354,6 +357,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuStdFonts->Append(Font_wxSMALL_FONT, wxT("wxSMALL_FONT"), wxT("Small font used by wxWidgets")); menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWidgets")); menuStdFonts->Append(Font_wxSWISS_FONT, wxT("wxSWISS_FONT"), wxT("Swiss font used by wxWidgets")); + menuStdFonts->Append(Font_wxFont_Default, wxT("wxFont()"), wxT("wxFont constructed from default wxFontInfo")); menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts); wxMenu *menuSettingFonts = new wxMenu; @@ -774,6 +778,11 @@ void MyFrame::OnwxPointerFont(wxCommandEvent& event) DoChangeFont(font); } +void MyFrame::OnFontDefault(wxCommandEvent& WXUNUSED(event)) +{ + DoChangeFont(wxFont(wxFontInfo())); +} + void MyFrame::OnwxSystemSettingsFont(wxCommandEvent& event) { wxFont font; diff --git a/software/scsi2sd-util/wxWidgets/samples/font/font_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/font/font_vc8.vcproj index 2585fd4b..a2103c8b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/font/font_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/font/font_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/font/font_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/font/font_vc9.vcproj index e27dda09..1ef4ea5c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/font/font_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/font/font_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/fswatcher/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/fswatcher/Makefile.in index 0688a2f2..50ed9e36 100644 --- a/software/scsi2sd-util/wxWidgets/samples/fswatcher/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/fswatcher/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc8.vcproj index 8beb8262..ad7acdb7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc9.vcproj index 89598f53..2d6f77f1 100644 --- a/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/fswatcher/fswatcher_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/grid/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/grid/Makefile.in index 80ab4459..7ce75268 100644 --- a/software/scsi2sd-util/wxWidgets/samples/grid/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/grid/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc8.vcproj index b9582c29..d75ed155 100644 --- a/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc9.vcproj index 178aa60e..f65a8600 100644 --- a/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/grid/grid_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/help/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/help/Makefile.in index e9ec567e..295bb1a9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/help/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/help/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/help/help_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/help/help_vc8.vcproj index 82f38465..dc662c23 100644 --- a/software/scsi2sd-util/wxWidgets/samples/help/help_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/help/help_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/help/help_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/help/help_vc9.vcproj index c73638ca..56284ef5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/help/help_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/help/help_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/htlbox/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/htlbox/Makefile.in index a6bc81d3..f0dfc1ab 100644 --- a/software/scsi2sd-util/wxWidgets/samples/htlbox/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/htlbox/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc8.vcproj index d852d3e7..7cedad9e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc9.vcproj index 6c9bdb93..308713a0 100644 --- a/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/htlbox/htlbox_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/about/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/about/Makefile.in index f51e754c..0ea5e382 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/about/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/about/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc8.vcproj index 35e01497..bc51595a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc9.vcproj index 92563c30..6f97a4b5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/about/about_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/help/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/help/Makefile.in index d94c5dee..f5cfb77c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/help/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/help/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc8.vcproj index 1b9a4a81..7e49474e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc9.vcproj index 2fc0e39d..6e008314 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/help/help_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/helpview/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/helpview/Makefile.in index 8a677efe..d3e4517a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/helpview/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/helpview/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc8.vcproj index 3201bf53..eae0160e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc9.vcproj index 578ac2ad..2a3aa841 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/helpview/helpview_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/htmlctrl/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/htmlctrl/Makefile.in index 6b6e75c7..f9c7dfea 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/htmlctrl/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/htmlctrl/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/printing/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/printing/Makefile.in index a99fd1c3..b38d6098 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/printing/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/printing/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc8.vcproj index 0696c1fe..297aed67 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc9.vcproj index 4760d8e5..2149ce87 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/printing/printing_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/test/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/test/Makefile.in index a743012d..78bb1f6d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/test/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/test/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc8.vcproj index 5de753fb..6acd5bc2 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc9.vcproj index 091c1af3..d593ceef 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/test/test_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/virtual/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/virtual/Makefile.in index b59dfa13..e0a2d70a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/virtual/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/virtual/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc8.vcproj index 1447adec..0931b38e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc9.vcproj index 8d142ebc..2a143058 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/virtual/virtual_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/widget/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/widget/Makefile.in index 53b20c4b..1c482f4f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/widget/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/widget/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc8.vcproj index 5fa181bf..ca0adbde 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc9.vcproj index 94974f89..c8957ec4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/widget/widget_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/zip/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/html/zip/Makefile.in index cb99c8a4..e8b84858 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/zip/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/html/zip/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc8.vcproj index ce0aa89f..2b70e94c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc9.vcproj index 216a1667..d1643345 100644 --- a/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/html/zip/zip_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/image/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/image/Makefile.in index 73732471..6e104cd7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/image/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/image/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/image/image_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/image/image_vc8.vcproj index 2d0f88d5..11364a47 100644 --- a/software/scsi2sd-util/wxWidgets/samples/image/image_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/image/image_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/image/image_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/image/image_vc9.vcproj index bc045c9a..5b94fe84 100644 --- a/software/scsi2sd-util/wxWidgets/samples/image/image_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/image/image_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/internat/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/internat/Makefile.in index 468213fc..3d0615d5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/internat/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/internat/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc8.vcproj index 8f208ce4..1d9c8d93 100644 --- a/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc9.vcproj index 62d40b42..3eff0136 100644 --- a/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/internat/internat_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/ipc/Makefile.in index 38b13ac3..a1f4c14c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcclient.vcproj index 6a95a469..28429fbb 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcclient.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcserver.vcproj index 569d7659..a3182452 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_baseipcserver.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcclient.vcproj index 80586726..9dff9709 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcclient.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcserver.vcproj index 747da6ef..102260b6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc8_ipcserver.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcclient.vcproj index 1bd36b1a..21855927 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcclient.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcserver.vcproj index d7329e09..2a8cf247 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_baseipcserver.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcclient.vcproj index ec755bd1..1b136b58 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcclient.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcserver.vcproj index ebe40795..6c6f3ae8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ipc/ipc_vc9_ipcserver.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/joytest/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/joytest/Makefile.in index c0ad6eb6..469e3fb6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/joytest/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/joytest/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc8.vcproj index 3c121327..49de059a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc9.vcproj index de8317e3..c869d351 100644 --- a/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/joytest/joytest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/keyboard/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/keyboard/Makefile.in index 983b3e27..1f211a50 100644 --- a/software/scsi2sd-util/wxWidgets/samples/keyboard/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/keyboard/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc8.vcproj index f687d379..641bc38f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc9.vcproj index 17b8375e..56aaaa17 100644 --- a/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/keyboard/keyboard_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/layout/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/layout/Makefile.in index 5dc3cc4d..19d3a596 100644 --- a/software/scsi2sd-util/wxWidgets/samples/layout/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/layout/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc8.vcproj index 3e873230..0d0d12b7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc9.vcproj index aa6a34eb..6a4c79be 100644 --- a/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/layout/layout_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/listctrl/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/listctrl/Makefile.in index b761e940..a4afefde 100644 --- a/software/scsi2sd-util/wxWidgets/samples/listctrl/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/listctrl/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc8.vcproj index 58260ef8..25058204 100644 --- a/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc9.vcproj index 0fdb36fe..df532160 100644 --- a/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/listctrl/listctrl_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mdi/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/mdi/Makefile.in index 987b3229..6dda874d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mdi/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/mdi/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc8.vcproj index d27414b0..dd6ebcb6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc9.vcproj index 08e22932..6202372b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mdi/mdi_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/Makefile.in index 5d3a9876..52ec42ee 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc8.vcproj index ecd9d96c..74181a3e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc9.vcproj index 84bd22f5..b29125ad 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mediaplayer/mediaplayer_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/memcheck/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/memcheck/Makefile.in index e3ffcc2b..019a97c8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/memcheck/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/memcheck/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc8.vcproj index bce5123b..ebf91341 100644 --- a/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc9.vcproj index d70fe3fb..5deccee4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/memcheck/memcheck_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/menu/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/menu/Makefile.in index 25a1362a..0f355459 100644 --- a/software/scsi2sd-util/wxWidgets/samples/menu/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/menu/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc8.vcproj index 232f7034..2e8b08e5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc9.vcproj index f6ad4bd9..fbdfb9d0 100644 --- a/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/menu/menu_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc8.vcproj index 12a7b586..535e0910 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc9.vcproj index e92a1b07..1f3520db 100644 --- a/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/mfc/mfc_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/Info_carbon.plist b/software/scsi2sd-util/wxWidgets/samples/minimal/Info_carbon.plist index d856922c..f1f8d76a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/Info_carbon.plist +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/Info_carbon.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.0.1, (c) 2005-2013 wxWidgets + $(PRODUCT_NAME) version 3.0.2, (c) 2005-2013 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 3.0.1, (c) 2005-2011 wxWidgets + 3.0.2, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.0.1 + 3.0.2 CFBundleSignature ???? CFBundleVersion - 3.0.1 + 3.0.2 NSHumanReadableCopyright Copyright 2005-2013 wxWidgets diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/Info_cocoa.plist b/software/scsi2sd-util/wxWidgets/samples/minimal/Info_cocoa.plist index 7494813e..19256247 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/Info_cocoa.plist +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.0.1, (c) 2005-2013 wxWidgets + $(PRODUCT_NAME) version 3.0.2, (c) 2005-2013 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 3.0.1, (c) 2005-2011 wxWidgets + 3.0.2, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.0.1 + 3.0.2 CFBundleSignature ???? CFBundleVersion - 3.0.1 + 3.0.2 NSHumanReadableCopyright Copyright 2005-2013 wxWidgets NSPrincipalClass diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/minimal/Makefile.in index 86a46fff..6ff96732 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj index 8c956f8f..5d55b1c4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj @@ -254,10 +254,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; PRODUCT_NAME = minimal_carbon; }; name = Debug; @@ -266,10 +263,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; PRODUCT_NAME = minimal_carbon; }; name = Release; diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj index 8e82bff4..54dfaf85 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj @@ -254,10 +254,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; PRODUCT_NAME = minimal_cocoa; }; name = Debug; @@ -266,10 +263,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(OTHER_LDFLAGS)", - "-lz", - ); + OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; PRODUCT_NAME = minimal_cocoa; }; name = Release; diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj index 5795d349..d58c9ee1 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */; buildSettings = { - OTHER_LDFLAGS = "-lz"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = minimal_iphone; }; name = Debug; diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc8.vcproj index 058ae302..56b78cb8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc9.vcproj index 6e96a7ea..6f9d4a67 100644 --- a/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/minimal/minimal_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/nativdlg/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/nativdlg/Makefile.in index ed7a1b94..cef6523c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/nativdlg/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/nativdlg/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc8.vcproj index a6ae4241..51222b5a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc9.vcproj index 6918523f..6c4d1294 100644 --- a/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/nativdlg/nativdlg_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/notebook/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/notebook/Makefile.in index 77382414..d1936d31 100644 --- a/software/scsi2sd-util/wxWidgets/samples/notebook/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/notebook/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc8.vcproj index 999cc839..897fec00 100644 --- a/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc9.vcproj index 602b1d09..2cb4bfd3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/notebook/notebook_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/oleauto/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/oleauto/Makefile.in index df273010..ec6cf403 100644 --- a/software/scsi2sd-util/wxWidgets/samples/oleauto/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/oleauto/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc8.vcproj index c07a9012..4c43841b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc9.vcproj index 17bfe360..ca12254e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/oleauto/oleauto_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/Makefile.in index c0993494..3e4f2e06 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc8.vcproj index e31d08fc..5b96e3e8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc9.vcproj index f61245ed..f5305353 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/cube/cube_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/Makefile.in index c24b1300..edebc594 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc8.vcproj index de59f609..53a04785 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc9.vcproj index a8f995ac..2e47cb48 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/isosurf/isosurf_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/Makefile.in index 070f1335..0f544cc1 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc8.vcproj index dd655006..50cc6d88 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc9.vcproj index 01a57676..bad7acec 100644 --- a/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/opengl/penguin/penguin_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/Makefile.in index bbcbb502..d4ad954e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc8.vcproj index af87e765..a9d35a7d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc9.vcproj index c1175a13..2bab4997 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ownerdrw/ownerdrw_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/popup/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/popup/Makefile.in index f9e34a38..acf75c4f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/popup/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/popup/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc8.vcproj index ae043c0c..e3332bfe 100644 --- a/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc9.vcproj index 1229a953..797ba98b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/popup/popup_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/power/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/power/Makefile.in index ed10a070..81368031 100644 --- a/software/scsi2sd-util/wxWidgets/samples/power/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/power/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/power/power_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/power/power_vc8.vcproj index acff60c1..007f065e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/power/power_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/power/power_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/power/power_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/power/power_vc9.vcproj index 72335924..048c07c7 100644 --- a/software/scsi2sd-util/wxWidgets/samples/power/power_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/power/power_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/preferences/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/preferences/Makefile.in index 8da47507..594042cc 100644 --- a/software/scsi2sd-util/wxWidgets/samples/preferences/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/preferences/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc8.vcproj index 9ffd49ce..142ab1d9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc9.vcproj index 03616a13..e1e01adb 100644 --- a/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/preferences/preferences_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/printing/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/printing/Makefile.in index bfa4260a..a06a72b5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/printing/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/printing/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc8.vcproj index 99135856..657ee813 100644 --- a/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc9.vcproj index 57f57822..2964e600 100644 --- a/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/printing/printing_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/propgrid/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/propgrid/Makefile.in index 2a612b95..a2e8f81c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/propgrid/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/propgrid/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc8.vcproj index b3a16d4b..7dcc9ce0 100644 --- a/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc9.vcproj index c709cab0..fb28dbba 100644 --- a/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/propgrid/propgrid_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/regtest/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/regtest/Makefile.in index e275c00f..ee57db4e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/regtest/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/regtest/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc8.vcproj index d96dbe4d..82bb9021 100644 --- a/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc9.vcproj index 2346563c..74d24b81 100644 --- a/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/regtest/regtest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/render/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/render/Makefile.in index cf19ae7a..19652b20 100644 --- a/software/scsi2sd-util/wxWidgets/samples/render/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/render/Makefile.in @@ -50,7 +50,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 WX_RELEASE_NODOT = 30 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_renddll.vcproj b/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_renddll.vcproj index 2a65b1c8..25c3c09f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_renddll.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_renddll.vcproj @@ -16,6 +16,9 @@ + @@ -200,6 +203,185 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_render.vcproj b/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_render.vcproj index c4fb4c96..c2b4b3c6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_render.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/render/render_vc8_render.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_renddll.vcproj b/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_renddll.vcproj index 38d16dbc..02b971ae 100644 --- a/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_renddll.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_renddll.vcproj @@ -16,6 +16,9 @@ + @@ -199,6 +202,184 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_render.vcproj b/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_render.vcproj index 82374eee..b9235626 100644 --- a/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_render.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/render/render_vc9_render.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ribbon/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/ribbon/Makefile.in index 49c26976..587cebd3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ribbon/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/ribbon/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc8.vcproj index 3ad0380c..10b75f20 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc9.vcproj index b17bfbb8..ebc73aad 100644 --- a/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/ribbon/ribbon_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/richtext/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/richtext/Makefile.in index 48e2658b..ddacb4aa 100644 --- a/software/scsi2sd-util/wxWidgets/samples/richtext/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/richtext/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext.cpp b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext.cpp index 0758d49e..d226d362 100644 --- a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext.cpp +++ b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext.cpp @@ -213,10 +213,12 @@ public: void CreateStyles(); wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; } - wxRichTextPrinting* GetPrinting() const { return m_printing; } - wxRichTextStyleSheet* m_styleSheet; + +#if wxUSE_PRINTING_ARCHITECTURE + wxRichTextPrinting* GetPrinting() const { return m_printing; } wxRichTextPrinting* m_printing; +#endif }; // Define a new frame type: this is going to be our main frame @@ -303,8 +305,10 @@ public: void OnURL(wxTextUrlEvent& event); void OnStyleSheetReplacing(wxRichTextEvent& event); +#if wxUSE_PRINTING_ARCHITECTURE void OnPrint(wxCommandEvent& event); void OnPreview(wxCommandEvent& event); +#endif void OnPageSetup(wxCommandEvent& event); void OnInsertImage(wxCommandEvent& event); @@ -479,8 +483,10 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_SWITCH_STYLE_SHEETS, MyFrame::OnSwitchStyleSheets) EVT_MENU(ID_MANAGE_STYLES, MyFrame::OnManageStyles) +#if wxUSE_PRINTING_ARCHITECTURE EVT_MENU(ID_PRINT, MyFrame::OnPrint) EVT_MENU(ID_PREVIEW, MyFrame::OnPreview) +#endif EVT_MENU(ID_PAGE_SETUP, MyFrame::OnPageSetup) EVT_TEXT_URL(wxID_ANY, MyFrame::OnURL) @@ -516,10 +522,12 @@ bool MyApp::OnInit() #endif m_styleSheet = new wxRichTextStyleSheet; +#if wxUSE_PRINTING_ARCHITECTURE m_printing = new wxRichTextPrinting(wxT("Test Document")); m_printing->SetFooterText(wxT("@TITLE@"), wxRICHTEXT_PAGE_ALL, wxRICHTEXT_PAGE_CENTRE); m_printing->SetFooterText(wxT("Page @PAGENUM@"), wxRICHTEXT_PAGE_ALL, wxRICHTEXT_PAGE_RIGHT); +#endif CreateStyles(); @@ -570,7 +578,9 @@ bool MyApp::OnInit() size.Scale(0.75, 0.75); MyFrame *frame = new MyFrame(wxT("wxRichTextCtrl Sample"), wxID_ANY, wxDefaultPosition, size); +#if wxUSE_PRINTING_ARCHITECTURE m_printing->SetParentWindow(frame); +#endif // and show it (the frames, unlike simple controls, are not shown when // created initially) @@ -584,7 +594,9 @@ bool MyApp::OnInit() int MyApp::OnExit() { +#if wxUSE_PRINTING_ARCHITECTURE delete m_printing; +#endif delete m_styleSheet; return 0; @@ -769,8 +781,10 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, fileMenu->Append(ID_RELOAD, wxT("&Reload Text\tF2"), wxT("Reload the initial text")); fileMenu->AppendSeparator(); fileMenu->Append(ID_PAGE_SETUP, wxT("Page Set&up..."), wxT("Page setup")); +#if wxUSE_PRINTING_ARCHITECTURE fileMenu->Append(ID_PRINT, wxT("&Print...\tCtrl+P"), wxT("Print")); fileMenu->Append(ID_PREVIEW, wxT("Print Pre&view"), wxT("Print preview")); +#endif fileMenu->AppendSeparator(); fileMenu->Append(ID_VIEW_HTML, wxT("&View as HTML"), wxT("View HTML")); fileMenu->AppendSeparator(); @@ -2082,6 +2096,7 @@ void MyFrame::OnStyleSheetReplacing(wxRichTextEvent& event) event.Veto(); } +#if wxUSE_PRINTING_ARCHITECTURE void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event)) { wxGetApp().GetPrinting()->PrintBuffer(m_richTextCtrl->GetBuffer()); @@ -2091,6 +2106,7 @@ void MyFrame::OnPreview(wxCommandEvent& WXUNUSED(event)) { wxGetApp().GetPrinting()->PreviewBuffer(m_richTextCtrl->GetBuffer()); } +#endif void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event)) { diff --git a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc8.vcproj index 5a970a6b..aea7574c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc9.vcproj index e5cdbde0..e4e1d9fb 100644 --- a/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/richtext/richtext_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sashtest/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/sashtest/Makefile.in index 5880b84f..7f193279 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sashtest/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/sashtest/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc8.vcproj index 04812b3b..597f00bf 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc9.vcproj index 30adf1a9..59585794 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sashtest/sashtest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/scroll/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/scroll/Makefile.in index 4355cbff..3d2b312f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/scroll/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/scroll/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc8.vcproj index 811ad336..1096e28f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc9.vcproj index e1d7df32..d9ce4ae4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/scroll/scroll_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/shaped/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/shaped/Makefile.in index 04581328..4de614d5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/shaped/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/shaped/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc8.vcproj index dde618cf..c8e9752c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc9.vcproj index 48be6e5e..501656df 100644 --- a/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/shaped/shaped_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/sockets/Makefile.in index ca8ea474..4a243c44 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseclient.vcproj index 0836bf4d..75297cb2 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseclient.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseserver.vcproj index e8708a0e..63d240d3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_baseserver.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_client.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_client.vcproj index dab1489b..d56cf531 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_client.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_client.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_server.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_server.vcproj index be5196e1..977244dc 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_server.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc8_server.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseclient.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseclient.vcproj index 0070688a..3a85430f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseclient.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseclient.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseserver.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseserver.vcproj index 01442364..9bed67a8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseserver.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_baseserver.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_client.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_client.vcproj index 222b3609..5566f280 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_client.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_client.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_server.vcproj b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_server.vcproj index 6cc1deaf..0b9e433b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_server.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sockets/sockets_vc9_server.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sound/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/sound/Makefile.in index dc5324e3..83fdf8b2 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sound/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/sound/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc8.vcproj index 41d6969f..1e41c2a3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc9.vcproj index 9b69b955..e505a541 100644 --- a/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/sound/sound_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/splash/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/splash/Makefile.in index 0851fea6..2c251668 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splash/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/splash/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc8.vcproj index 298c257d..f9773c24 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc9.vcproj index cf901396..419ae1e8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/splash/splash_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/splitter/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/splitter/Makefile.in index b0810bf4..d4b377d8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splitter/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/splitter/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc8.vcproj index 88ea479c..ceb8683f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc9.vcproj index 9da5a75b..7f3b7ce9 100644 --- a/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/splitter/splitter_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/statbar/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/statbar/Makefile.in index 975751b4..ed9381fe 100644 --- a/software/scsi2sd-util/wxWidgets/samples/statbar/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/statbar/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc8.vcproj index 1031d28c..ae132f34 100644 --- a/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc9.vcproj index 92d01f57..b1530426 100644 --- a/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/statbar/statbar_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/stc/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/stc/Makefile.in index 5680ffa1..384d9179 100644 --- a/software/scsi2sd-util/wxWidgets/samples/stc/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/stc/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc8.vcproj index 5a33f5e8..2dc58b77 100644 --- a/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc9.vcproj index c34c637e..a4e8461c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/stc/stctest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/svg/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/svg/Makefile.in index 3f102fab..dc54548e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/svg/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/svg/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc8.vcproj index 3b40856d..40bbb912 100644 --- a/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc9.vcproj index 5efcb680..0d525462 100644 --- a/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/svg/svgtest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/taborder/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/taborder/Makefile.in index 90c50405..9bf1dbb3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taborder/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/taborder/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TABORDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc8.vcproj index f36e5518..ba20f857 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc9.vcproj index 834b8aa1..a9a5b5a6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/taborder/taborder_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/taskbar/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/taskbar/Makefile.in index 585b4006..11e0700b 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taskbar/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/taskbar/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc8.vcproj index 5da4ccbb..5cad0a02 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc9.vcproj index 9f7aff1f..d64a550d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/taskbar/taskbar_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/text/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/text/Makefile.in index 7d1071ab..7e64cd7c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/text/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/text/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/text/text_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/text/text_vc8.vcproj index e440233b..f7ffef15 100644 --- a/software/scsi2sd-util/wxWidgets/samples/text/text_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/text/text_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/text/text_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/text/text_vc9.vcproj index 90f4dbd8..c029267a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/text/text_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/text/text_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/thread/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/thread/Makefile.in index 96f31f3a..481434b6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/thread/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/thread/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc8.vcproj index 18deea84..de8eb12a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc9.vcproj index beb0a080..70708550 100644 --- a/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/thread/thread_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/toolbar/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/toolbar/Makefile.in index 287e5a3f..a832bac3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/toolbar/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/toolbar/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar.cpp b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar.cpp index d57a548f..0e313d77 100644 --- a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar.cpp +++ b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar.cpp @@ -209,6 +209,7 @@ enum IDM_TOOLBAR_OTHER_1, IDM_TOOLBAR_OTHER_2, IDM_TOOLBAR_OTHER_3, + IDM_TOOLBAR_OTHER_4, // tools menu items IDM_TOOLBAR_ENABLEPRINT, @@ -300,7 +301,7 @@ bool MyApp::OnInit() // Create the main frame window MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY, wxT("wxToolBar Sample"), - wxPoint(100, 100), wxSize(650, 300)); + wxPoint(100, 100), wxSize(650, 350)); frame->Show(true); @@ -739,6 +740,8 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, wxT("Third"), wxBITMAP(save)); m_tbar->AddSeparator(); m_tbar->AddTool(wxID_HELP, wxT("Help"), wxBITMAP(help)); + m_tbar->AddTool(IDM_TOOLBAR_OTHER_4, wxT("Disabled"), wxBITMAP(cut), wxBITMAP(paste)); + m_tbar->EnableTool(IDM_TOOLBAR_OTHER_4, false); m_tbar->Realize(); } diff --git a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc8.vcproj index f97dde87..3a75f4ec 100644 --- a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc9.vcproj index e3f38034..5f2c86ac 100644 --- a/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/toolbar/toolbar_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/treectrl/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/treectrl/Makefile.in index a975f63d..ed9004cb 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treectrl/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/treectrl/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc8.vcproj index 317c25f4..71a646b2 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc9.vcproj index 6e4560ca..a2c1f8ec 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/treectrl/treectrl_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.cpp b/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.cpp index 7ace8a09..28f9874e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.cpp +++ b/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.cpp @@ -1597,7 +1597,7 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) wxPoint screenpt = ClientToScreen(clientpt); wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"), - item->GetDesc(), screenpt.x, screenpt.y); + item ? item->GetDesc() : wxString(wxS("unknown")), screenpt.x, screenpt.y); ShowMenu(itemId, clientpt); event.Skip(); @@ -1642,7 +1642,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event) MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); - wxLogMessage(wxT("Item \"%s\" right clicked"), item->GetDesc()); + wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() : wxString(wxS("unknown"))); event.Skip(); } diff --git a/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.h b/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.h index 1d1ce2ff..9fe1beba 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.h +++ b/software/scsi2sd-util/wxWidgets/samples/treectrl/treetest.h @@ -45,7 +45,7 @@ public: MyTreeItemData(const wxString& desc) : m_desc(desc) { } void ShowInfo(wxTreeCtrl *tree); - const wxChar *GetDesc() const { return m_desc.c_str(); } + wxString const& GetDesc() const { return m_desc; } private: wxString m_desc; diff --git a/software/scsi2sd-util/wxWidgets/samples/treelist/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/treelist/Makefile.in index 8cc225be..f9d3d349 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treelist/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/treelist/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc8.vcproj index 56493ea4..30a8c1f6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc9.vcproj index c4de61f3..3bd0c879 100644 --- a/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/treelist/treelist_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/typetest/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/typetest/Makefile.in index aaf311ad..2b861039 100644 --- a/software/scsi2sd-util/wxWidgets/samples/typetest/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/typetest/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc8.vcproj index 2f30e1dc..a39092a8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc9.vcproj index a54656bf..051a0aa3 100644 --- a/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/typetest/typetest_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/uiaction/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/uiaction/Makefile.in index 888a992e..a08692b8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/uiaction/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/uiaction/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib UIACTION_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc8.vcproj index 5258b2b4..f4d3ebb4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc9.vcproj index b7eb2a95..59f98b33 100644 --- a/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/uiaction/uiaction_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/validate/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/validate/Makefile.in index ed62d5d3..9ea3fae5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/validate/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/validate/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc8.vcproj index 88d6b8a5..ae338964 100644 --- a/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc9.vcproj index 618123f1..8a3fb70d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/validate/validate_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/vscroll/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/vscroll/Makefile.in index d269b3ca..2e292ce1 100644 --- a/software/scsi2sd-util/wxWidgets/samples/vscroll/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/vscroll/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc8.vcproj index e9a60939..c76f206a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc9.vcproj index 9a73e821..ee61aee8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/vscroll/vscroll_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/webview/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/webview/Makefile.in index acba0e58..8c34026a 100644 --- a/software/scsi2sd-util/wxWidgets/samples/webview/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/webview/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc8.vcproj index f1c63914..7d6bc069 100644 --- a/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc9.vcproj index 1a33f6fe..fa6b5532 100644 --- a/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/webview/webview_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/widgets/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/widgets/Makefile.in index 7a21b3ec..dc91c8ea 100644 --- a/software/scsi2sd-util/wxWidgets/samples/widgets/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/widgets/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc8.vcproj index f4002738..52b43bac 100644 --- a/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc9.vcproj index 21b033a4..37859287 100644 --- a/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/widgets/widgets_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/wizard/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/wizard/Makefile.in index c9bc92f1..34546d2d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wizard/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/wizard/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc8.vcproj index 47686e2b..eec40bb4 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc9.vcproj index d2a4522b..8e8b9957 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/wizard/wizard_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/Makefile.in index b3b4728d..79713a78 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WRAPSIZER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc8.vcproj index 7bfeacc7..28f85d8d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc9.vcproj index 74f4579f..08dbb86d 100644 --- a/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/wrapsizer/wrapsizer_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/xrc/Makefile.in index 22062a16..7e02d184 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -203,7 +203,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) data: @mkdir -p ./rc - @for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif; do \ + @for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \ if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \ then x=yep ; \ else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \ diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.bcc b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.bcc index f7ec67bf..580a6987 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.bcc +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.bcc @@ -267,7 +267,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc + for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.gcc b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.gcc index bfc89d69..922d7133 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.gcc +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.gcc @@ -256,7 +256,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc + for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc $(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.vc b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.vc index 12c909c9..050cc8f6 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.vc +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.vc @@ -389,7 +389,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc + for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.wat b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.wat index 19b15787..511470c1 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.wat +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/makefile.wat @@ -302,7 +302,7 @@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res data : .SYMBOLIC if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc + for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.cpp b/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.cpp index a86de0d2..62b22cb5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.cpp +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.cpp @@ -90,6 +90,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(XRCID("platform_property_tool_or_menuitem"), MyFrame::OnPlatformPropertyToolOrMenuCommand) EVT_MENU(XRCID("art_provider_tool_or_menuitem"), MyFrame::OnArtProviderToolOrMenuCommand) EVT_MENU(XRCID("variable_expansion_tool_or_menuitem"), MyFrame::OnVariableExpansionToolOrMenuCommand) + EVT_MENU(XRCID("variants"), MyFrame::OnVariants) EVT_MENU(XRCID("recursive_load"), MyFrame::OnRecursiveLoad) EVT_MENU(wxID_ABOUT, MyFrame::OnAboutToolOrMenuCommand) wxEND_EVENT_TABLE() @@ -331,6 +332,13 @@ void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(even dlg.ShowModal(); } +void MyFrame::OnVariants(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("variants_dialog")); + dlg.ShowModal(); +} + void MyFrame::OnRecursiveLoad(wxCommandEvent& WXUNUSED(event)) { // this dialog is created manually to show how you can inject a single diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.h b/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.h index 0a03f71d..23c8ad30 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.h +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/myframe.h @@ -48,6 +48,7 @@ private: void OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& event); void OnArtProviderToolOrMenuCommand(wxCommandEvent& event); void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event); + void OnVariants(wxCommandEvent& event); void OnRecursiveLoad(wxCommandEvent& event); void OnAnimationCtrlPlay(wxCommandEvent& event); diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/controls.xrc b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/controls.xrc index 6675e4ec..862f62a0 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/controls.xrc +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/controls.xrc @@ -1044,7 +1044,7 @@ lay them out using wxSizers, absolute positioning, everything you like! - 2 + 4 0 0 0 @@ -1068,33 +1068,32 @@ lay them out using wxSizers, absolute positioning, everything you like! wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 5 - - + + wxALIGN_CENTER_VERTICAL|wxALL 5 - + 180,-1 - - TooManySecrets + you@some.whe.re wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 5 - - + + wxALIGN_CENTER_VERTICAL|wxALL 5 - - 180,90 - - "So many pretty widgets" said Pooh, said he. "So many pretty widgets", said Pooh. + + 180,-1 + + TooManySecrets @@ -1112,6 +1111,22 @@ lay them out using wxSizers, absolute positioning, everything you like! true love + + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL + 5 + + + + + + wxALIGN_CENTER_VERTICAL|wxALL + 5 + + 180,90 + + "So many pretty widgets" said Pooh, said he. "So many pretty widgets", said Pooh. + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/menu.xrc b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/menu.xrc index de48e52c..f94ddef5 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/menu.xrc +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/menu.xrc @@ -74,6 +74,11 @@ variable.xpm Replace variables in the XRC file at runtime + + + variants.xpm + Show different controls variants + Show how an individual control can be loaded diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xpm b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xpm new file mode 100644 index 00000000..07b66e8b --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const variants_xpm[] = { +"16 16 4 1", +" c None", +". c #0E2CEF", +"- c #EF2C0E", +"* c #0EEF2C", +" ", +" **** ", +" **** ", +" **** ", +" **** ", +" ---- **** ", +" ---- **** ", +" ---- **** ", +" ---- **** ", +"... ---- **** ", +"... ---- **** ", +"... ---- **** ", +"... ---- **** ", +"... ---- **** ", +"... ---- **** ", +" "}; diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xrc b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xrc new file mode 100644 index 00000000..e3c624f1 --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/rc/variants.xrc @@ -0,0 +1,110 @@ + + + + + + Control Variants Example + 1 + + 4 + 10 + 10 + + wxALIGN_CENTER|wxALL + 5 + + + mini + + + + wxALIGN_CENTER|wxALL + 5 + + + small + + + + wxALIGN_CENTER|wxALL + 5 + + + + + + wxALIGN_CENTER|wxALL + 5 + + + large + + + + + wxALIGN_CENTER|wxALL + 5 + + + mini + + + + wxALIGN_CENTER|wxALL + 5 + + + small + + + + wxALIGN_CENTER|wxALL + 5 + + + + + + wxALIGN_CENTER|wxALL + 5 + + + large + + + + + wxALIGN_CENTER|wxALL + 5 + + + mini + + + + wxALIGN_CENTER|wxALL + 5 + + + small + + + + wxALIGN_CENTER|wxALL + 5 + + + + + + wxALIGN_CENTER|wxALL + 5 + + + large + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo.bkl b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo.bkl index 7523f2cb..305b4f1c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo.bkl +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo.bkl @@ -37,7 +37,9 @@ fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm - uncenter.xrc update.gif variable.xpm variable.xrc + uncenter.xrc update.gif + variable.xpm variable.xrc + variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc8.vcproj index 4a0b93b9..12e61cc8 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc9.vcproj index 30f94257..7290d47f 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/xrc/xrcdemo_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xti/Makefile.in b/software/scsi2sd-util/wxWidgets/samples/xti/Makefile.in index 1f102a6a..aa6131ea 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xti/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/samples/xti/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib XTI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc8.vcproj b/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc8.vcproj index f9024316..a049869e 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc9.vcproj b/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc9.vcproj index 514a6539..161b4b7c 100644 --- a/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/samples/xti/xti_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/src/aui/auibar.cpp b/software/scsi2sd-util/wxWidgets/src/aui/auibar.cpp index 89df6300..96707599 100644 --- a/software/scsi2sd-util/wxWidgets/src/aui/auibar.cpp +++ b/software/scsi2sd-util/wxWidgets/src/aui/auibar.cpp @@ -2669,6 +2669,9 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) { + if (HasCapture()) + return; + wxRect cli_rect(wxPoint(0,0), GetClientSize()); if (m_gripperSizerItem) @@ -2705,6 +2708,9 @@ void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) { + if (HasCapture()) + return; + wxAuiToolBarItem* hitItem; hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); @@ -2735,6 +2741,9 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) { + if (HasCapture()) + return; + wxRect cli_rect(wxPoint(0,0), GetClientSize()); if (m_gripperSizerItem) @@ -2774,6 +2783,9 @@ void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) { + if (HasCapture()) + return; + wxAuiToolBarItem* hitItem; hitItem = FindToolByPosition(evt.GetX(), evt.GetY()); diff --git a/software/scsi2sd-util/wxWidgets/src/aui/auibook.cpp b/software/scsi2sd-util/wxWidgets/src/aui/auibook.cpp index af591825..eb77d897 100644 --- a/software/scsi2sd-util/wxWidgets/src/aui/auibook.cpp +++ b/software/scsi2sd-util/wxWidgets/src/aui/auibook.cpp @@ -1377,6 +1377,13 @@ void wxAuiTabCtrl::OnChar(wxKeyEvent& event) bool bWindowChange = (key == WXK_PAGEUP) || (key == WXK_PAGEDOWN) || bCtrlDown; bool bFromTab = (key == WXK_TAB); + if (bFromTab && !bWindowChange) + { + // Handle ordinary tabs via Navigate. This is needed at least for wxGTK to tab properly. + Navigate(bForward ? wxNavigationKeyEvent::IsForward : wxNavigationKeyEvent::IsBackward); + return; + } + wxAuiNotebook* nb = wxDynamicCast(GetParent(), wxAuiNotebook); if (!nb) { diff --git a/software/scsi2sd-util/wxWidgets/src/common/arrstr.cpp b/software/scsi2sd-util/wxWidgets/src/common/arrstr.cpp index f66fcdd4..4111fd08 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/arrstr.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/arrstr.cpp @@ -20,6 +20,7 @@ #endif #include "wx/arrstr.h" +#include "wx/scopedarray.h" #include "wx/beforestd.h" #include @@ -106,10 +107,14 @@ void wxArrayString::Copy(const wxArrayString& src) } // grow the array -void wxArrayString::Grow(size_t nIncrement) +wxString *wxArrayString::Grow(size_t nIncrement) { - // only do it if no more place - if ( (m_nSize - m_nCount) < nIncrement ) { + if ( (m_nSize - m_nCount) >= nIncrement ) + { + // We already have enough space. + return NULL; + } + // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would // be never resized! #if ARRAY_DEFAULT_INITIAL_SIZE == 0 @@ -122,6 +127,9 @@ void wxArrayString::Grow(size_t nIncrement) if (m_nSize < nIncrement) m_nSize = nIncrement; m_pItems = new wxString[m_nSize]; + + // Nothing to free, we hadn't had any memory before. + return NULL; } else { // otherwise when it's called for the first time, nIncrement would be 0 @@ -140,12 +148,12 @@ void wxArrayString::Grow(size_t nIncrement) for ( size_t j = 0; j < m_nCount; j++ ) pNew[j] = m_pItems[j]; - // delete old memory (but do not release the strings!) - delete [] m_pItems; + wxString* const pItemsOld = m_pItems; m_pItems = pNew; + + return pItemsOld; } - } } // deletes all the strings from the list @@ -288,7 +296,10 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert) return (size_t)lo; } else { - Grow(nInsert); + // Now that we must postpone freeing the old memory until we don't need it + // any more, i.e. don't reference "str" which could be a reference to one + // of our own strings. + wxScopedArray oldStrings(Grow(nInsert)); for (size_t i = 0; i < nInsert; i++) { @@ -308,7 +319,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert) wxCHECK_RET( m_nCount <= m_nCount + nInsert, wxT("array size overflow in wxArrayString::Insert") ); - Grow(nInsert); + wxScopedArray oldStrings(Grow(nInsert)); for (int j = m_nCount - nIndex - 1; j >= 0; j--) m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j]; @@ -327,7 +338,7 @@ wxArrayString::insert(iterator it, const_iterator first, const_iterator last) const int idx = it - begin(); // grow it once - Grow(last - first); + wxScopedArray oldStrings(Grow(last - first)); // reset "it" since it can change inside Grow() it = begin() + idx; diff --git a/software/scsi2sd-util/wxWidgets/src/common/cairo.cpp b/software/scsi2sd-util/wxWidgets/src/common/cairo.cpp index a10ca649..bfb69a29 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/cairo.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/cairo.cpp @@ -214,6 +214,10 @@ (cairo_format_t format, int width), (format, width), 0) \ m( int, cairo_version, \ (), (), 0) \ + m( int, cairo_image_surface_get_width, \ + (cairo_surface_t *surface), (surface), 0) \ + m( int, cairo_image_surface_get_height, \ + (cairo_surface_t *surface), (surface), 0) \ m( int, cairo_image_surface_get_stride, \ (cairo_surface_t *surface), (surface), 0) \ m( unsigned char *, cairo_image_surface_get_data, \ diff --git a/software/scsi2sd-util/wxWidgets/src/common/cmdline.cpp b/software/scsi2sd-util/wxWidgets/src/common/cmdline.cpp index 972d8431..1362a657 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/cmdline.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/cmdline.cpp @@ -144,7 +144,13 @@ struct wxCmdLineOption bool HasValue() const { return m_hasVal; } void SetNegated() { m_isNegated = true; } - bool IsNegated() const { return m_isNegated; } + bool IsNegated() const + { + wxASSERT_MSG( kind == wxCMD_LINE_SWITCH, + wxT("kind mismatch in wxCmdLineArg") ); + + return m_isNegated; + } // Reset to the initial state, called before parsing another command line. void Reset() @@ -272,7 +278,8 @@ void wxCmdLineParserData::SetArguments(int argc, char **argv) // temporarily change the locale here. The only drawback is that changing // the locale is thread-unsafe but precisely because we're called so early // it's hopefully safe to assume that no other threads had been created yet. - char * const locOld = SetAllLocaleFacets(""); + char * const locOld = SetAllLocaleFacets(NULL); + SetAllLocaleFacets(""); wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld ); for ( int n = 0; n < argc; n++ ) @@ -666,6 +673,7 @@ int wxCmdLineParser::Parse(bool showUsage) Reset(); // parse everything + m_data->m_parameters.clear(); wxString arg; size_t count = m_data->m_arguments.size(); for ( size_t n = 1; ok && (n < count); n++ ) // 0 is program name diff --git a/software/scsi2sd-util/wxWidgets/src/common/datavcmn.cpp b/software/scsi2sd-util/wxWidgets/src/common/datavcmn.cpp index 9d68261f..25d85f4f 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/datavcmn.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/datavcmn.cpp @@ -1461,16 +1461,12 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { long l = value; - wxSize size = labelRect.GetSize(); -#ifdef __WXMAC__ - size = wxSize( wxMax(70,labelRect.width ), -1 ); -#endif wxString str; str.Printf( wxT("%d"), (int) l ); wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, - labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); + labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); #ifdef __WXMAC__ - size = sc->GetSize(); + const wxSize size = sc->GetSize(); wxPoint pt = sc->GetPosition(); sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y ); #endif diff --git a/software/scsi2sd-util/wxWidgets/src/common/datetime.cpp b/software/scsi2sd-util/wxWidgets/src/common/datetime.cpp index 669d0a32..4446a334 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/datetime.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/datetime.cpp @@ -2084,9 +2084,15 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) { long secDiff = wxGetTimeZone() + tz.GetOffset(); - // we need to know whether DST is or not in effect for this date unless - // the test disabled by the caller - if ( !noDST && (IsDST() == 1) ) + // We are converting from the local time, but local time zone does not + // include the DST offset (as it varies depending on the date), so we have + // to handle DST manually, unless a special flag inhibiting this was + // specified. + // + // Notice that we also shouldn't add the DST offset if we're already in the + // local time zone, as indicated by offset of 0, converting from local time + // to local time zone shouldn't change it, whether DST is in effect or not. + if ( !noDST && secDiff && (IsDST() == 1) ) { // FIXME we assume that the DST is always shifted by 1 hour secDiff -= 3600; @@ -2099,9 +2105,8 @@ wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST) { long secDiff = wxGetTimeZone() + tz.GetOffset(); - // we need to know whether DST is or not in effect for this date unless - // the test disabled by the caller - if ( !noDST && (IsDST() == 1) ) + // See comment in MakeTimezone() above, the logic here is exactly the same. + if ( !noDST && secDiff && (IsDST() == 1) ) { // FIXME we assume that the DST is always shifted by 1 hour secDiff -= 3600; diff --git a/software/scsi2sd-util/wxWidgets/src/common/datetimefmt.cpp b/software/scsi2sd-util/wxWidgets/src/common/datetimefmt.cpp index 48550250..5084c282 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/datetimefmt.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/datetimefmt.cpp @@ -271,6 +271,30 @@ GetWeekDayFromName(wxString::const_iterator& p, return wd; } +// return the year of the Monday of the week containing the given date +int +GetWeekBasedYear(const wxDateTime& dt) +{ + const wxDateTime::Tm tm = dt.GetTm(); + + int year = tm.year; + + // The week-based year can only be different from the normal year for few + // days in the beginning and the end of the year. + if ( tm.yday > 361 ) + { + if ( dt.GetWeekOfYear() == 1 ) + year++; + } + else if ( tm.yday < 5 ) + { + if ( dt.GetWeekOfYear() == 53 ) + year--; + } + + return year; +} + // parses string starting at given iterator using the specified format and, // optionally, a fall back format (and optionally another one... but it stops // there, really) @@ -324,17 +348,38 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT)); #endif // we have to use our own implementation if the date is out of range of - // strftime() or if we use non standard specifiers (notice that "%z" is - // special because it is de facto standard under Unix but is not supported - // under Windows) + // strftime() #ifdef wxHAS_STRFTIME time_t time = GetTicks(); - if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l")) + bool canUseStrftime = time != (time_t)-1; + + // We also can't use strftime() if we use non standard specifier: either + // our own extension "%l" or one of "%g", "%G", "%V", "%z" which are POSIX + // but not supported under Windows. + for ( wxString::const_iterator p = format.begin(); + canUseStrftime && p != format.end(); + ++p ) + { + if ( *p != '%' ) + continue; + + // set the default format + switch ( (*++p).GetValue() ) + { + case 'l': #ifdef __WINDOWS__ - && !wxStrstr(format, wxT("%z")) -#endif - ) + case 'g': + case 'G': + case 'V': + case 'z': +#endif // __WINDOWS__ + canUseStrftime = false; + break; + } + } + + if ( canUseStrftime ) { // use strftime() struct tm tmstruct; @@ -408,6 +453,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const switch ( (*++p).GetValue() ) { case wxT('Y'): // year has 4 digits + case wxT('G'): // (and ISO week year too) case wxT('z'): // time zone as well fmt = wxT("%04d"); break; @@ -579,6 +625,14 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const res += wxString::Format(fmt, tm.mday); break; + case wxT('g'): // 2-digit week-based year + res += wxString::Format(fmt, GetWeekBasedYear(*this) % 100); + break; + + case wxT('G'): // week-based year with century + res += wxString::Format(fmt, GetWeekBasedYear(*this)); + break; + case wxT('H'): // hour in 24h format (00-23) res += wxString::Format(fmt, tm.hour); break; @@ -624,6 +678,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz)); break; + case wxT('V'): // ISO week number case wxT('W'): // week number in the year (Monday 1st week day) res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz)); break; diff --git a/software/scsi2sd-util/wxWidgets/src/common/dcbase.cpp b/software/scsi2sd-util/wxWidgets/src/common/dcbase.cpp index bbef6164..c8008344 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/dcbase.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/dcbase.cpp @@ -1484,7 +1484,6 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points, wxCoord y = b; long x2 = 1; long y2 = y*y; - long y2_old = 0; long y_old = 0; // Lists for quadrant 1 to 4 wxPointList pointsarray[4]; @@ -1492,7 +1491,6 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points, for( x = 0; x <= a; ++x ) { x2 = x2+x+x-1; - y2_old = y2; y_old = y; bool bNewPoint = false; while( y2 > c1 - c2 * x2 && y > 0 ) diff --git a/software/scsi2sd-util/wxWidgets/src/common/dcgraph.cpp b/software/scsi2sd-util/wxWidgets/src/common/dcgraph.cpp index acc689c3..d27e9cc0 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/dcgraph.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/dcgraph.cpp @@ -24,6 +24,8 @@ #include "wx/icon.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" + #include "wx/math.h" + #include "wx/geometry.h" #endif //----------------------------------------------------------------------------- @@ -304,6 +306,9 @@ void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h ); } + + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); } void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) @@ -315,6 +320,9 @@ void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) wxCoord h = icon.GetHeight(); m_graphicContext->DrawIcon( icon , x, y, w, h ); + + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); } bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) ) @@ -570,7 +578,7 @@ void wxGCDCImpl::DoCrossHair( wxCoord x, wxCoord y ) m_graphicContext->StrokeLine(x,0,x,h); CalcBoundingBox(0, 0); - CalcBoundingBox(0+w, 0+h); + CalcBoundingBox(w, h); } void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, @@ -617,6 +625,11 @@ void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, if ( fill && ((x1!=x2)||(y1!=y2)) ) path.AddLineToPoint( xc, yc ); m_graphicContext->DrawPath(path); + + wxRect2DDouble box = path.GetBox(); + CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); + CalcBoundingBox(wxRound(box.m_x + box.m_width), + wxRound(box.m_y + box.m_height)); } void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, @@ -627,16 +640,19 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, if ( !m_logicalFunctionSupported ) return; - m_graphicContext->PushState(); - m_graphicContext->Translate(x+w/2.0,y+h/2.0); + wxCoord dx = x + w / 2.0; + wxCoord dy = y + h / 2.0; wxDouble factor = ((wxDouble) w) / h; - m_graphicContext->Scale( factor , 1.0); + m_graphicContext->PushState(); + m_graphicContext->Translate(dx, dy); + m_graphicContext->Scale(factor, 1.0); + wxGraphicsPath path; // since these angles (ea,sa) are measured counter-clockwise, we invert them to // get clockwise angles if ( m_brush.GetStyle() != wxTRANSPARENT ) { - wxGraphicsPath path = m_graphicContext->CreatePath(); + path = m_graphicContext->CreatePath(); path.MoveToPoint( 0, 0 ); path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea ); path.AddLineToPoint( 0, 0 ); @@ -653,6 +669,17 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, m_graphicContext->DrawPath( path ); } + wxRect2DDouble box = path.GetBox(); + // apply the transformation to the box + box.m_x *= factor; + box.m_width *= factor; + box.m_x += dx; + box.m_y += dy; + + CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); + CalcBoundingBox(wxRound(box.m_x + box.m_width), + wxRound(box.m_y + box.m_height)); + m_graphicContext->PopState(); } @@ -667,19 +694,34 @@ void wxGCDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset) { wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") ); + wxASSERT_MSG( n > 0, wxT("wxGCDC(cg)::DoDrawLines - number of points too small") ); if ( !m_logicalFunctionSupported ) return; + int minX = points[0].x; + int minY = points[0].y; + int maxX = minX; + int maxY = minY; + wxPoint2DDouble* pointsD = new wxPoint2DDouble[n]; for( int i = 0; i < n; ++i) { - pointsD[i].m_x = points[i].x + xoffset; - pointsD[i].m_y = points[i].y + yoffset; + wxPoint p = points[i]; + pointsD[i].m_x = p.x + xoffset; + pointsD[i].m_y = p.y + yoffset; + + if (p.x < minX) minX = p.x; + else if (p.x > maxX) maxX = p.x; + if (p.y < minY) minY = p.y; + else if (p.y > maxY) maxY = p.y; } m_graphicContext->StrokeLines( n , pointsD); delete[] pointsD; + + CalcBoundingBox(minX + xoffset, minY + yoffset); + CalcBoundingBox(maxX + xoffset, maxY + yoffset); } #if wxUSE_SPLINES @@ -738,6 +780,11 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points) path.AddLineToPoint( x2 , y2 ); m_graphicContext->StrokePath( path ); + + wxRect2DDouble box = path.GetBox(); + CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); + CalcBoundingBox(wxRound(box.m_x + box.m_width), + wxRound(box.m_y + box.m_height)); } #endif // wxUSE_SPLINES @@ -756,17 +803,31 @@ void wxGCDCImpl::DoDrawPolygon( int n, const wxPoint points[], if (points[n-1] != points[0]) closeIt = true; + int minX = points[0].x; + int minY = points[0].y; + int maxX = minX; + int maxY = minY; + wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)]; for( int i = 0; i < n; ++i) { - pointsD[i].m_x = points[i].x + xoffset; - pointsD[i].m_y = points[i].y + yoffset; + wxPoint p = points[i]; + pointsD[i].m_x = p.x + xoffset; + pointsD[i].m_y = p.y + yoffset; + + if (p.x < minX) minX = p.x; + else if (p.x > maxX) maxX = p.x; + if (p.y < minY) minY = p.y; + else if (p.y > maxY) maxY = p.y; } if ( closeIt ) pointsD[n] = pointsD[0]; m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle); delete[] pointsD; + + CalcBoundingBox(minX + xoffset, minY + yoffset); + CalcBoundingBox(maxX + xoffset, maxY + yoffset); } void wxGCDCImpl::DoDrawPolyPolygon(int n, @@ -796,6 +857,11 @@ void wxGCDCImpl::DoDrawPolyPolygon(int n, path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset); } m_graphicContext->DrawPath( path , fillStyle); + + wxRect2DDouble box = path.GetBox(); + CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y)); + CalcBoundingBox(wxRound(box.m_x + box.m_width), + wxRound(box.m_y + box.m_height)); } void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) @@ -809,6 +875,9 @@ void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) if (w == 0 || h == 0) return; + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); + if ( m_graphicContext->ShouldOffset() ) { // if we are offsetting the entire rectangle is moved 0.5, so the @@ -835,6 +904,9 @@ void wxGCDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, if (w == 0 || h == 0) return; + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); + if ( m_graphicContext->ShouldOffset() ) { // if we are offsetting the entire rectangle is moved 0.5, so the @@ -852,6 +924,9 @@ void wxGCDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) if ( !m_logicalFunctionSupported ) return; + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); + if ( m_graphicContext->ShouldOffset() ) { // if we are offsetting the entire rectangle is moved 0.5, so the @@ -961,6 +1036,9 @@ bool wxGCDCImpl::DoStretchBlit( // reset composition m_graphicContext->SetCompositionMode(formerMode); + CalcBoundingBox(xdest, ydest); + CalcBoundingBox(xdest + dstWidth, ydest + dstHeight); + return retval; } @@ -1048,6 +1126,11 @@ void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y) m_graphicContext->DrawText( str, x ,y); else m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) ); + + wxCoord w, h; + GetOwner()->GetTextExtent(str, &w, &h); + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); } bool wxGCDCImpl::CanGetTextExtent() const @@ -1191,6 +1274,9 @@ void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect, m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height); m_graphicContext->SetPen(m_pen); m_graphicContext->SetBrush(m_brush); + + CalcBoundingBox(rect.x, rect.y); + CalcBoundingBox(rect.x + rect.width, rect.y + rect.height); } void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect, @@ -1220,6 +1306,9 @@ void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect, m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height); m_graphicContext->SetPen(m_pen); m_graphicContext->SetBrush(m_brush); + + CalcBoundingBox(rect.x, rect.y); + CalcBoundingBox(rect.x + rect.width, rect.y + rect.height); } void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y, diff --git a/software/scsi2sd-util/wxWidgets/src/common/event.cpp b/software/scsi2sd-util/wxWidgets/src/common/event.cpp index 914995e2..d92a4acf 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/event.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/event.cpp @@ -37,6 +37,7 @@ #if wxUSE_GUI #include "wx/window.h" + #include "wx/combobox.h" #include "wx/control.h" #include "wx/dc.h" #include "wx/spinbutt.h" @@ -435,20 +436,27 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) wxString wxCommandEvent::GetString() const { - if (m_eventType != wxEVT_TEXT || !m_eventObject) - { - return m_cmdString; - } - else + // This is part of the hack retrieving the event string from the control + // itself only when/if it's really needed to avoid copying potentially huge + // strings coming from multiline text controls. For consistency we also do + // it for combo boxes, even though there are no real performance advantages + // in doing this for them. + if (m_eventType == wxEVT_TEXT && m_eventObject) { #if wxUSE_TEXTCTRL wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl); if ( txt ) return txt->GetValue(); - else #endif // wxUSE_TEXTCTRL - return m_cmdString; + +#if wxUSE_COMBOBOX + wxComboBox* combo = wxDynamicCast(m_eventObject, wxComboBox); + if ( combo ) + return combo->GetValue(); +#endif // wxUSE_COMBOBOX } + + return m_cmdString; } // ---------------------------------------------------------------------------- @@ -1886,7 +1894,7 @@ bool wxEventBlocker::ProcessEvent(wxEvent& event) return true; // yes, it should: mark this event as processed } - return false; + return wxEvtHandler::ProcessEvent(event);; } #endif // wxUSE_GUI diff --git a/software/scsi2sd-util/wxWidgets/src/common/ffile.cpp b/software/scsi2sd-util/wxWidgets/src/common/ffile.cpp index 0f479565..962242eb 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/ffile.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/ffile.cpp @@ -153,12 +153,28 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount) bool wxFFile::Write(const wxString& s, const wxMBConv& conv) { - const wxWX2MBbuf buf = s.mb_str(conv); - if ( !buf ) - return false; + // Writing nothing always succeeds -- and simplifies the check for + // conversion failure below. + if ( s.empty() ) + return true; - const size_t size = strlen(buf); // FIXME: use buf.length() when available - return Write(buf, size) == size; + const wxWX2MBbuf buf = s.mb_str(conv); + +#if wxUSE_UNICODE + const size_t size = buf.length(); + + if ( !size ) + { + // This means that the conversion failed as the original string wasn't + // empty (we explicitly checked for this above) and in this case we + // must fail too to indicate that we can't save the data. + return false; + } +#else + const size_t size = s.length(); +#endif + + return Write(buf, size) == size; } bool wxFFile::Flush() diff --git a/software/scsi2sd-util/wxWidgets/src/common/file.cpp b/software/scsi2sd-util/wxWidgets/src/common/file.cpp index b2a5aca7..9d5571d5 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/file.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/file.cpp @@ -356,17 +356,28 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) bool wxFile::Write(const wxString& s, const wxMBConv& conv) { - const wxWX2MBbuf buf = s.mb_str(conv); - if ( !buf ) - return false; + // Writing nothing always succeeds -- and simplifies the check for + // conversion failure below. + if ( s.empty() ) + return true; + + const wxWX2MBbuf buf = s.mb_str(conv); #if wxUSE_UNICODE - const size_t size = buf.length(); + const size_t size = buf.length(); + + if ( !size ) + { + // This means that the conversion failed as the original string wasn't + // empty (we explicitly checked for this above) and in this case we + // must fail too to indicate that we can't save the data. + return false; + } #else - const size_t size = s.length(); + const size_t size = s.length(); #endif - return Write(buf, size) == size; + return Write(buf, size) == size; } // flush diff --git a/software/scsi2sd-util/wxWidgets/src/common/filename.cpp b/software/scsi2sd-util/wxWidgets/src/common/filename.cpp index 6acde760..fcbc0e72 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/filename.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/filename.cpp @@ -102,6 +102,7 @@ #include "wx/msw/private.h" #include // for CLSID_ShellLink #include "wx/msw/missing.h" + #include "wx/msw/ole/oleutils.h" #endif #if defined(__WXMAC__) @@ -1706,6 +1707,9 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, if (ext.CmpNoCase(wxT("lnk"))!=0) return false; + // Ensure OLE is initialized. + wxOleInitializer oleInit; + // create a ShellLink object hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*) &psl); @@ -1793,8 +1797,13 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) // get cwd only once - small time saving wxString cwd = wxGetCwd(); - Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); - fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); + + // Normalize the paths but avoid changing the case or turning a shortcut + // into a file that it points to. + const int normFlags = wxPATH_NORM_ALL & + ~(wxPATH_NORM_CASE | wxPATH_NORM_SHORTCUT); + Normalize(normFlags, cwd, format); + fnBase.Normalize(normFlags, cwd, format); bool withCase = IsCaseSensitive(format); diff --git a/software/scsi2sd-util/wxWidgets/src/common/fswatchercmn.cpp b/software/scsi2sd-util/wxWidgets/src/common/fswatchercmn.cpp index cb32a141..b946f640 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/fswatchercmn.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/fswatchercmn.cpp @@ -144,9 +144,11 @@ wxFileSystemWatcherBase::AddAny(const wxFileName& path, else { wxFSWatchInfo& watch = it->second; - int count = watch.IncRef(); + const int count = watch.IncRef(); wxLogTrace(wxTRACE_FSWATCHER, "'%s' is now watched %d times", canonical, count); + + wxUnusedVar(count); // could be unused if debug tracing is disabled } return true; } diff --git a/software/scsi2sd-util/wxWidgets/src/common/ftp.cpp b/software/scsi2sd-util/wxWidgets/src/common/ftp.cpp index c205cd75..cfb59e63 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/ftp.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/ftp.cpp @@ -769,7 +769,11 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path) wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path); if ( !CheckCommand(tmp_str, '1') ) + { + delete sock; + return NULL; + } sock = AcceptIfActive(sock); if ( !sock ) @@ -800,7 +804,11 @@ wxOutputStream *wxFTP::GetOutputStream(const wxString& path) wxString tmp_str = wxT("STOR ") + path; if ( !CheckCommand(tmp_str, '1') ) + { + delete sock; + return NULL; + } sock = AcceptIfActive(sock); diff --git a/software/scsi2sd-util/wxWidgets/src/common/imaggif.cpp b/software/scsi2sd-util/wxWidgets/src/common/imaggif.cpp index 9c0f8bea..ba2f3bbc 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/imaggif.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/imaggif.cpp @@ -721,13 +721,14 @@ bool wxGIFHandler_WriteControl(wxOutputStream *stream, int maskIndex, int delayMilliSecs) { wxUint8 buf[8]; + const wxUint16 delay = delayMilliSecs / 10; buf[0] = GIF_MARKER_EXT; // extension marker buf[1] = GIF_MARKER_EXT_GRAPHICS_CONTROL; buf[2] = 4; // length of block buf[3] = (maskIndex != wxNOT_FOUND) ? 1 : 0; // has transparency - buf[4] = delayMilliSecs / 10; // delay time - buf[5] = 0; + buf[4] = delay & 0xff; // delay time + buf[5] = (delay >> 8) & 0xff; // delay time second byte buf[6] = (maskIndex != wxNOT_FOUND) ? (wxUint8) maskIndex : 0; buf[7] = 0; return wxGIFHandler_Write(stream, buf, sizeof(buf)); diff --git a/software/scsi2sd-util/wxWidgets/src/common/languageinfo.cpp b/software/scsi2sd-util/wxWidgets/src/common/languageinfo.cpp index b162aea0..db69b404 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/languageinfo.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/languageinfo.cpp @@ -151,9 +151,6 @@ #ifndef LANG_JAPANESE #define LANG_JAPANESE (0) #endif -#ifndef LANG_KABYLE -#define LANG_KABYLE (0) -#endif #ifndef LANG_KANNADA #define LANG_KANNADA (0) #endif @@ -268,6 +265,9 @@ #ifndef LANG_VIETNAMESE #define LANG_VIETNAMESE (0) #endif +#ifndef LANG_KABYLE +#define LANG_KABYLE (0) +#endif #ifndef SUBLANG_ARABIC_ALGERIA #define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT #endif @@ -666,7 +666,6 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)") LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese") LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese") - LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle") LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada") LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri") LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)") @@ -789,6 +788,7 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba") LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang") LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu") + LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle") } #undef LNG diff --git a/software/scsi2sd-util/wxWidgets/src/common/sckaddr.cpp b/software/scsi2sd-util/wxWidgets/src/common/sckaddr.cpp index da66df3c..f2adc563 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/sckaddr.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/sckaddr.cpp @@ -46,7 +46,7 @@ #include -#if defined(__UNIX__) && !defined(__WXMSW__) +#if defined(__UNIX__) && !defined(__WINDOWS__) #include #include #endif // __UNIX__ diff --git a/software/scsi2sd-util/wxWidgets/src/common/stopwatch.cpp b/software/scsi2sd-util/wxWidgets/src/common/stopwatch.cpp index 47745b80..aad2b0bb 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/stopwatch.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/stopwatch.cpp @@ -67,7 +67,19 @@ struct PerfCounter wxCRIT_SECT_DECLARE_MEMBER(cs); LARGE_INTEGER freq; bool init; -} gs_perfCounter; +}; + +// Return the global perf counter state. +// +// This is wrapped in a function to avoid initialization order problems, +// otherwise simply creating a global wxStopWatch variable could crash because +// it would be using a (possibly) still uninitialized critical section. +PerfCounter& GetPerfCounterState() +{ + static PerfCounter s_perfCounter; + + return s_perfCounter; +} #endif // __WINDOWS__ @@ -79,10 +91,11 @@ const int MICROSECONDS_PER_SECOND = 1000*1000; void wxStopWatch::DoStart() { #ifdef __WINDOWS__ - if ( !gs_perfCounter.init ) + PerfCounter& perfCounter = GetPerfCounterState(); + if ( !perfCounter.init ) { - wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs); - ::QueryPerformanceFrequency(&gs_perfCounter.freq); + wxCRIT_SECT_LOCKER(lock, perfCounter.cs); + ::QueryPerformanceFrequency(&perfCounter.freq); // Just a sanity check: it's not supposed to happen but verify that // ::QueryPerformanceCounter() succeeds so that we can really use it. @@ -92,10 +105,10 @@ void wxStopWatch::DoStart() wxLogDebug("QueryPerformanceCounter() unexpected failed (%s), " "will not use it.", wxSysErrorMsg()); - gs_perfCounter.freq.QuadPart = 0; + perfCounter.freq.QuadPart = 0; } - gs_perfCounter.init = true; + perfCounter.init = true; } #endif // __WINDOWS__ @@ -107,8 +120,8 @@ wxLongLong wxStopWatch::GetClockFreq() const #ifdef __WINDOWS__ // Under MSW we use the high resolution performance counter timer which has // its own frequency (usually related to the CPU clock speed). - if ( gs_perfCounter.CanBeUsed() ) - return gs_perfCounter.freq.QuadPart; + if ( GetPerfCounterState().CanBeUsed() ) + return GetPerfCounterState().freq.QuadPart; #endif // __WINDOWS__ #ifdef HAVE_GETTIMEOFDAY @@ -136,7 +149,7 @@ void wxStopWatch::Start(long t0) wxLongLong wxStopWatch::GetCurrentClockValue() const { #ifdef __WINDOWS__ - if ( gs_perfCounter.CanBeUsed() ) + if ( GetPerfCounterState().CanBeUsed() ) { LARGE_INTEGER counter; ::QueryPerformanceCounter(&counter); diff --git a/software/scsi2sd-util/wxWidgets/src/common/string.cpp b/software/scsi2sd-util/wxWidgets/src/common/string.cpp index a2f18a8b..2d30e939 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/string.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/string.cpp @@ -1244,17 +1244,17 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const } // out-of-bounds requests return sensible things - if ( nFirst + nCount > nLen ) - { - nCount = nLen - nFirst; - } - if ( nFirst > nLen ) { // AllocCopy() will return empty string return wxEmptyString; } + if ( nCount > nLen - nFirst ) + { + nCount = nLen - nFirst; + } + wxString dest(*this, nFirst, nCount); if ( dest.length() != nCount ) { @@ -1797,6 +1797,8 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const // point which is different in different locales. bool wxString::ToCDouble(double *pVal) const { + // See the explanations in FromCDouble() below for the reasons for all this. + // Create a copy of this string using the decimal point instead of whatever // separator the current locale uses. #if wxUSE_INTL @@ -1854,20 +1856,19 @@ wxString wxString::FromCDouble(double val, int precision) { wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" ); -#if wxUSE_STD_IOSTREAM && wxUSE_STD_STRING - // We assume that we can use the ostream and not wstream for numbers. - wxSTD ostringstream os; - if ( precision != -1 ) - { - os.precision(precision); - os.setf(std::ios::fixed, std::ios::floatfield); - } + // Unfortunately there is no good way to get the number directly in the C + // locale. Some platforms provide special functions to do this (e.g. + // _sprintf_l() in MSVS or sprintf_l() in BSD systems), but some systems we + // still support don't have them and it doesn't seem worth it to have two + // different ways to do the same thing. Also, in principle, using the + // standard C++ streams should allow us to do it, but some implementations + // of them are horribly broken and actually change the global C locale, + // thus randomly affecting the results produced in other threads, when + // imbue() stream method is called (for the record, the latest libstdc++ + // version included in OS X does it and so seem to do the versions + // currently included in Android NDK and both FreeBSD and OpenBSD), so we + // can't do this neither and are reduced to this hack. - os << val; - return os.str(); -#else // !wxUSE_STD_IOSTREAM - // Can't use iostream locale support, fall back to the manual method - // instead. wxString s = FromDouble(val, precision); #if wxUSE_INTL wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, @@ -1881,7 +1882,6 @@ wxString wxString::FromCDouble(double val, int precision) s.Replace(sep, "."); return s; -#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM } // --------------------------------------------------------------------------- diff --git a/software/scsi2sd-util/wxWidgets/src/common/translation.cpp b/software/scsi2sd-util/wxWidgets/src/common/translation.cpp index 455fb315..b5b33de9 100644 --- a/software/scsi2sd-util/wxWidgets/src/common/translation.cpp +++ b/software/scsi2sd-util/wxWidgets/src/common/translation.cpp @@ -95,6 +95,8 @@ wxStringToStringHashMap gs_msgIdCharset; // Platform specific helpers // ---------------------------------------------------------------------------- +#if wxUSE_LOG_TRACE + void LogTraceArray(const char *prefix, const wxArrayString& arr) { wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ',')); @@ -107,6 +109,13 @@ void LogTraceLargeArray(const wxString& prefix, const wxArrayString& arr) wxLogTrace(TRACE_I18N, " %s", *i); } +#else // !wxUSE_LOG_TRACE + +#define LogTraceArray(prefix, arr) +#define LogTraceLargeArray(prefix, arr) + +#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE + // Use locale-based detection as a fallback wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available)) { @@ -180,6 +189,8 @@ wxString GetPreferredUILanguage(const wxArrayString& available) #elif defined(__WXOSX__) +#if wxUSE_LOG_TRACE + void LogTraceArray(const char *prefix, CFArrayRef arr) { wxString s; @@ -193,6 +204,8 @@ void LogTraceArray(const char *prefix, CFArrayRef arr) wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s); } +#endif // wxUSE_LOG_TRACE + wxString GetPreferredUILanguage(const wxArrayString& available) { wxStringToStringHashMap availableNormalized; diff --git a/software/scsi2sd-util/wxWidgets/src/generic/animateg.cpp b/software/scsi2sd-util/wxWidgets/src/generic/animateg.cpp index f267c21c..dd2adecf 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/animateg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/animateg.cpp @@ -358,7 +358,7 @@ void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp) // (which uses the bitmap's mask), our background colour would be used for // transparent areas - and that's not what we want (at least for // consistency with the GTK version) - if ( bmp.GetMask() != NULL && GetParent() != NULL ) + if ( bmp.IsOk() && bmp.GetMask() != NULL && GetParent() != NULL ) SetBackgroundColour(GetParent()->GetBackgroundColour()); wxAnimationCtrlBase::SetInactiveBitmap(bmp); diff --git a/software/scsi2sd-util/wxWidgets/src/generic/datavgen.cpp b/software/scsi2sd-util/wxWidgets/src/generic/datavgen.cpp index 4e15c71a..95ef21a9 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/datavgen.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/datavgen.cpp @@ -4359,6 +4359,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) unsigned int lineFrom = oldCurrentRow, lineTo = current; + if ( lineFrom == static_cast(-1) ) + { + // If we hadn't had any current row before, treat this as a + // simple click and select the new row only. + lineFrom = current; + } + if ( lineTo < lineFrom ) { lineTo = lineFrom; diff --git a/software/scsi2sd-util/wxWidgets/src/generic/graphicc.cpp b/software/scsi2sd-util/wxWidgets/src/generic/graphicc.cpp index 767bd09e..2d715e8c 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/graphicc.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/graphicc.cpp @@ -387,7 +387,9 @@ class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext public: wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ); wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ); +#if wxUSE_PRINTING_ARCHITECTURE wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ); +#endif #ifdef __WXGTK__ wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window ); #endif @@ -1314,6 +1316,10 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surfac { m_surface = bitmap; m_pattern = cairo_pattern_create_for_surface(m_surface); + + m_width = cairo_image_surface_get_width(m_surface); + m_height = cairo_image_surface_get_height(m_surface); + m_buffer = NULL; } wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer ) @@ -1640,6 +1646,7 @@ public : bool m_offset; } ; +#if wxUSE_PRINTING_ARCHITECTURE wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ) : wxGraphicsContext(renderer) { @@ -1684,6 +1691,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& org = dc.GetLogicalOrigin(); cairo_translate( m_context, -org.x, -org.y ); } +#endif wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ) : wxGraphicsContext(renderer) @@ -2336,7 +2344,9 @@ public : virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); +#if wxUSE_PRINTING_ARCHITECTURE virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); +#endif virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); @@ -2429,11 +2439,13 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc) return new wxCairoContext(this,dc); } +#if wxUSE_PRINTING_ARCHITECTURE wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc) { ENSURE_LOADED_OR_RETURN(NULL); return new wxCairoContext(this, dc); } +#endif #ifdef __WXMSW__ #if wxUSE_ENH_METAFILE diff --git a/software/scsi2sd-util/wxWidgets/src/generic/grid.cpp b/software/scsi2sd-util/wxWidgets/src/generic/grid.cpp index e292e452..6d7815a3 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/grid.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/grid.cpp @@ -1680,10 +1680,7 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) int x, y; m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); wxPoint pt = dc.GetDeviceOrigin(); - if (GetLayoutDirection() == wxLayout_RightToLeft) - dc.SetDeviceOrigin( pt.x+x, pt.y ); - else - dc.SetDeviceOrigin( pt.x-x, pt.y ); + dc.SetDeviceOrigin( pt.x-x, pt.y ); wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() ); m_owner->DrawColLabels( dc, cols ); @@ -2359,12 +2356,15 @@ wxGrid::SetTable(wxGridTableBase *table, m_numRows = table->GetNumberRows(); m_numCols = table->GetNumberCols(); - if ( m_useNativeHeader ) - GetGridColHeader()->SetColumnCount(m_numCols); - m_table = table; m_table->SetView( this ); m_ownTable = takeOwnership; + + // Notice that this must be called after setting m_table as it uses it + // indirectly, via wxGrid::GetColLabelValue(). + if ( m_useNativeHeader ) + GetGridColHeader()->SetColumnCount(m_numCols); + m_selection = new wxGridSelection( this, selmode ); if (checkSelection) { @@ -3733,13 +3733,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // and check if we're on the "near" (usually left but right // in RTL case) part of the column - bool onNearPart; const int middle = GetColLeft(colValid) + GetColWidth(colValid)/2; - if ( GetLayoutDirection() == wxLayout_LeftToRight ) - onNearPart = (x <= middle); - else // wxLayout_RightToLeft - onNearPart = (x > middle); + const bool onNearPart = (x <= middle); // adjust for the column being dragged itself if ( pos < GetColPos(m_dragRowOrCol) ) diff --git a/software/scsi2sd-util/wxWidgets/src/generic/listctrl.cpp b/software/scsi2sd-util/wxWidgets/src/generic/listctrl.cpp index f17dd012..771c400b 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/listctrl.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/listctrl.cpp @@ -1420,6 +1420,13 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner, void wxListTextCtrlWrapper::EndEdit(EndReason reason) { + if( m_aboutToFinish ) + { + // We already called Finish which cannot be called + // more than once. + return; + } + m_aboutToFinish = true; switch ( reason ) @@ -1525,6 +1532,7 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) { if ( !m_aboutToFinish ) { + m_aboutToFinish = true; if ( !AcceptChanges() ) m_owner->OnRenameCancelled( m_itemEdited ); @@ -2252,6 +2260,17 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass return m_textctrlWrapper->GetText(); } +bool wxListMainWindow::EndEditLabel(bool cancel) +{ + if (!m_textctrlWrapper) + { + return false; + } + + m_textctrlWrapper->EndEdit(cancel ? wxListTextCtrlWrapper::End_Discard : wxListTextCtrlWrapper::End_Accept); + return true; +} + void wxListMainWindow::OnRenameTimer() { wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") ); @@ -5057,6 +5076,13 @@ wxTextCtrl *wxGenericListCtrl::EditLabel(long item, return m_mainWin->EditLabel( item, textControlClass ); } +#if wxABI_VERSION >= 30002 +bool wxGenericListCtrl::EndEditLabel(bool cancel) +{ + return m_mainWin->EndEditLabel(cancel); +} +#endif + wxTextCtrl *wxGenericListCtrl::GetEditControl() const { return m_mainWin->GetEditControl(); diff --git a/software/scsi2sd-util/wxWidgets/src/generic/preferencesg.cpp b/software/scsi2sd-util/wxWidgets/src/generic/preferencesg.cpp index 97236af3..45b311de 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/preferencesg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/preferencesg.cpp @@ -81,6 +81,11 @@ public: m_notebook->ChangeSelection(page); } + bool ShouldPreventAppExit() const + { + return false; + } + private: wxNotebook *m_notebook; }; diff --git a/software/scsi2sd-util/wxWidgets/src/generic/srchctlg.cpp b/software/scsi2sd-util/wxWidgets/src/generic/srchctlg.cpp index ccf7ccbc..758a195c 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/srchctlg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/srchctlg.cpp @@ -38,17 +38,6 @@ // the margin between the text control and the search/cancel buttons static const wxCoord MARGIN = 2; -// border around all controls to compensate for wxSIMPLE_BORDER -#if defined(__WXMSW__) -static const wxCoord BORDER = 0; -static const wxCoord ICON_MARGIN = 2; -static const wxCoord ICON_OFFSET = 2; -#else -static const wxCoord BORDER = 2; -static const wxCoord ICON_MARGIN = 0; -static const wxCoord ICON_OFFSET = 0; -#endif - #define LIGHT_STEP 160 // ---------------------------------------------------------------------------- @@ -127,7 +116,7 @@ protected: // // This is a bit ugly and it would arguably be better to use whatever size // the base class version returns and just centre the text vertically in - // the search control but I failed to modify the code in LayoutControls() + // the search control but I failed to modify the code in DoLayoutControls() // to do this easily and as there is much in that code I don't understand // (notably what is the logic for buttons sizing?) I prefer to not touch it // at all. @@ -381,8 +370,7 @@ void wxSearchCtrl::SetMenu( wxMenu* menu ) m_searchButton->Refresh(); } } - wxRect rect = GetRect(); - LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); + DoLayoutControls(); } wxMenu* wxSearchCtrl::GetMenu() @@ -405,8 +393,7 @@ void wxSearchCtrl::ShowSearchButton( bool show ) RecalcBitmaps(); } - wxRect rect = GetRect(); - LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); + DoLayoutControls(); } bool wxSearchCtrl::IsSearchButtonVisible() const @@ -424,8 +411,7 @@ void wxSearchCtrl::ShowCancelButton( bool show ) } m_cancelButtonVisible = show; - wxRect rect = GetRect(); - LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); + DoLayoutControls(); } bool wxSearchCtrl::IsCancelButtonVisible() const @@ -470,30 +456,36 @@ wxSize wxSearchCtrl::DoGetBestSize() const // buttons are square and equal to the height of the text control int height = sizeText.y; return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder, - height + 2*BORDER); + height) + DoGetBorderSize(); } void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height) { wxSearchCtrlBase::DoMoveWindow(x, y, width, height); - LayoutControls(0, 0, width, height); + DoLayoutControls(); +} + +void wxSearchCtrl::LayoutControls(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height)) +{ + DoLayoutControls(); } -void wxSearchCtrl::LayoutControls(int x, int y, int width, int height) +void wxSearchCtrl::DoLayoutControls() { if ( !m_text ) return; + const wxSize sizeTotal = GetClientSize(); + int width = sizeTotal.x, + height = sizeTotal.y; + wxSize sizeText = m_text->GetBestSize(); // make room for the search menu & clear button - int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2; - x += horizontalBorder; - y += BORDER; + int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2; + int x = horizontalBorder; width -= horizontalBorder*2; - height -= BORDER*2; - if (width < 0) width = 0; - if (height < 0) height = 0; wxSize sizeSearch(0,0); wxSize sizeCancel(0,0); @@ -524,13 +516,17 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height) // position the subcontrols inside the client area - m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height); - m_text->SetSize( x + sizeSearch.x + searchMargin, - y + ICON_OFFSET - BORDER, - textWidth, - height); - m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin, - y + ICON_OFFSET - 1, sizeCancel.x, height); + m_searchButton->SetSize(x, (height - sizeSearch.y) / 2, + sizeSearch.x, height); + x += sizeSearch.x; + x += searchMargin; + + m_text->SetSize(x, 0, textWidth, height); + x += textWidth; + x += cancelMargin; + + m_cancelButton->SetSize(x, (height - sizeCancel.y) / 2, + sizeCancel.x, height); } wxWindowList wxSearchCtrl::GetCompositeWindowParts() const @@ -1130,7 +1126,7 @@ void wxSearchCtrl::RecalcBitmaps() } wxSize sizeText = m_text->GetBestSize(); - int bitmapHeight = sizeText.y - 2 * ICON_MARGIN; + int bitmapHeight = sizeText.y - 4; int bitmapWidth = sizeText.y * 20 / 14; if ( !m_searchBitmapUser ) @@ -1177,7 +1173,7 @@ void wxSearchCtrl::RecalcBitmaps() m_cancelBitmap.GetWidth() != bitmapHeight ) { - m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER-1,bitmapHeight-BORDER-1); // square + m_cancelBitmap = RenderCancelBitmap(bitmapHeight,bitmapHeight); // square m_cancelButton->SetBitmapLabel(m_cancelBitmap); } // else this bitmap was set by user, don't alter @@ -1200,9 +1196,7 @@ void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ ) void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) ) { - int width, height; - GetSize(&width, &height); - LayoutControls(0, 0, width, height); + DoLayoutControls(); } #if wxUSE_MENUS diff --git a/software/scsi2sd-util/wxWidgets/src/generic/treectlg.cpp b/software/scsi2sd-util/wxWidgets/src/generic/treectlg.cpp index 46377671..b81a0b4f 100644 --- a/software/scsi2sd-util/wxWidgets/src/generic/treectlg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/generic/treectlg.cpp @@ -458,6 +458,13 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner, void wxTreeTextCtrl::EndEdit(bool discardChanges) { + if ( m_aboutToFinish ) + { + // We already called Finish which cannot be called + // more than once. + return; + } + m_aboutToFinish = true; if ( discardChanges ) @@ -555,6 +562,7 @@ void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event ) { if ( !m_aboutToFinish ) { + m_aboutToFinish = true; if ( !AcceptChanges() ) m_owner->OnRenameCancelled( m_itemEdited ); @@ -1307,6 +1315,10 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const { wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") ); + // Hidden root item is never visible. + if ( item == GetRootItem() && HasFlag(wxTR_HIDE_ROOT) ) + return false; + // An item is only visible if it's not a descendant of a collapsed item wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; wxGenericTreeItem* parent = pItem->GetParent(); @@ -3502,9 +3514,10 @@ wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool discardChanges) { - wxCHECK_RET( m_textCtrl, wxT("not editing label") ); - - m_textCtrl->EndEdit(discardChanges); + if (m_textCtrl) + { + m_textCtrl->EndEdit(discardChanges); + } } bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item, @@ -3696,46 +3709,39 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) #endif } } - else if ( event.LeftUp() || event.RightUp() ) + else if ( (event.LeftUp() || event.RightUp()) && m_isDragging ) { - if ( m_isDragging ) - { - ReleaseMouse(); + ReleaseMouse(); - // erase the highlighting - DrawDropEffect(m_dropTarget); + // erase the highlighting + DrawDropEffect(m_dropTarget); - if ( m_oldSelection ) - { - m_oldSelection->SetHilight(true); - RefreshLine(m_oldSelection); - m_oldSelection = NULL; - } + if ( m_oldSelection ) + { + m_oldSelection->SetHilight(true); + RefreshLine(m_oldSelection); + m_oldSelection = NULL; + } - // generate the drag end event - wxTreeEvent eventEndDrag(wxEVT_TREE_END_DRAG, this, item); + // generate the drag end event + wxTreeEvent eventEndDrag(wxEVT_TREE_END_DRAG, this, item); - eventEndDrag.m_pointDrag = CalcScrolledPosition(pt); + eventEndDrag.m_pointDrag = CalcScrolledPosition(pt); - (void)GetEventHandler()->ProcessEvent(eventEndDrag); + (void)GetEventHandler()->ProcessEvent(eventEndDrag); - m_isDragging = false; - m_dropTarget = NULL; + m_isDragging = false; + m_dropTarget = NULL; - SetCursor(m_oldCursor); + SetCursor(m_oldCursor); #if defined( __WXMSW__ ) || defined(__WXMAC__) || defined(__WXGTK20__) - Update(); + Update(); #else - // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI) - // instead (needs to be tested!) - wxYieldIfNeeded(); + // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI) + // instead (needs to be tested!) + wxYieldIfNeeded(); #endif - } - else - { - event.Skip(); - } } else { diff --git a/software/scsi2sd-util/wxWidgets/src/gtk/control.cpp b/software/scsi2sd-util/wxWidgets/src/gtk/control.cpp index cf257786..30409cd1 100644 --- a/software/scsi2sd-util/wxWidgets/src/gtk/control.cpp +++ b/software/scsi2sd-util/wxWidgets/src/gtk/control.cpp @@ -332,7 +332,10 @@ wxPoint wxControl::GTKGetEntryMargins(GtkEntry* entry) const #ifndef __WXGTK3__ #if GTK_CHECK_VERSION(2,10,0) // The margins we have previously set - const GtkBorder* border = gtk_entry_get_inner_border(entry); + const GtkBorder* border = NULL; + if (gtk_check_version(2,10,0) == NULL) + border = gtk_entry_get_inner_border(entry); + if ( border ) { marg.x = border->left + border->right; diff --git a/software/scsi2sd-util/wxWidgets/src/gtk/dcclient.cpp b/software/scsi2sd-util/wxWidgets/src/gtk/dcclient.cpp index 7af08539..09635b7c 100644 --- a/software/scsi2sd-util/wxWidgets/src/gtk/dcclient.cpp +++ b/software/scsi2sd-util/wxWidgets/src/gtk/dcclient.cpp @@ -1399,14 +1399,14 @@ void wxWindowDCImpl::DoDrawText(const wxString& text, DoDrawRotatedText(text, xLogical, yLogical, 0); } -void wxWindowDCImpl::DoDrawRotatedText(const wxString& text, int xLogical, int yLogical, double angle) +void wxWindowDCImpl::DoDrawRotatedText(const wxString& str, int xLogical, int yLogical, double angle) { - if (!m_gdkwindow || text.empty()) + if (!m_gdkwindow || str.empty()) return; wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); + pango_layout_set_text(m_layout, wxGTK_CONV(str), -1); const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); const GdkColor* bg_col = NULL; diff --git a/software/scsi2sd-util/wxWidgets/src/gtk/notebook.cpp b/software/scsi2sd-util/wxWidgets/src/gtk/notebook.cpp index 8ca5c034..57d507d8 100644 --- a/software/scsi2sd-util/wxWidgets/src/gtk/notebook.cpp +++ b/software/scsi2sd-util/wxWidgets/src/gtk/notebook.cpp @@ -429,7 +429,9 @@ bool wxNotebook::InsertPage( size_t position, pageData->m_imageIndex = imageId; pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); +#ifndef __WXGTK3__ gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2); +#endif pageData->m_image = NULL; if (imageId != -1) diff --git a/software/scsi2sd-util/wxWidgets/src/gtk/toolbar.cpp b/software/scsi2sd-util/wxWidgets/src/gtk/toolbar.cpp index ebc50a07..2a200c83 100644 --- a/software/scsi2sd-util/wxWidgets/src/gtk/toolbar.cpp +++ b/software/scsi2sd-util/wxWidgets/src/gtk/toolbar.cpp @@ -189,11 +189,13 @@ image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool) gtk_widget_get_allocation(widget, &alloc); GtkRequisition req; gtk_widget_get_requisition(widget, &req); - const int x = alloc.x + (alloc.width - req.width) / 2; - const int y = alloc.y + (alloc.height - req.height) / 2; #ifdef __WXGTK3__ + const int x = (alloc.width - req.width) / 2; + const int y = (alloc.height - req.height) / 2; bitmap.Draw(cr, x, y); #else + const int x = alloc.x + (alloc.width - req.width) / 2; + const int y = alloc.y + (alloc.height - req.height) / 2; gdk_draw_pixbuf( gtk_widget_get_window(widget), gtk_widget_get_style(widget)->black_gc, bitmap.GetPixbuf(), 0, 0, x, y, diff --git a/software/scsi2sd-util/wxWidgets/src/gtk/window.cpp b/software/scsi2sd-util/wxWidgets/src/gtk/window.cpp index ff9cf46a..996daafa 100644 --- a/software/scsi2sd-util/wxWidgets/src/gtk/window.cpp +++ b/software/scsi2sd-util/wxWidgets/src/gtk/window.cpp @@ -929,10 +929,13 @@ void AdjustCharEventKeyCodes(wxKeyEvent& event) // navigation will work. #define wxPROCESS_EVENT_ONCE(EventType, event) \ static EventType eventPrev; \ - if (memcmp(&eventPrev, event, sizeof(EventType)) == 0) \ + if (!gs_isNewEvent && memcmp(&eventPrev, event, sizeof(EventType)) == 0) \ return false; \ + gs_isNewEvent = false; \ eventPrev = *event +static bool gs_isNewEvent; + extern "C" { static gboolean gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), @@ -1526,11 +1529,15 @@ gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget), event.SetEventObject( win ); event.SetId( win->GetId() ); - bool ret = win->GTKProcessEvent(event); + // We ignore the result of the event processing here as we don't really + // want to prevent the other handlers from running even if we did process + // this event ourselves, there is no real advantage in doing this and it + // could actually be harmful, see #16055. + (void)win->GTKProcessEvent(event); g_lastMouseEvent = NULL; - return ret; + return FALSE; } //----------------------------------------------------------------------------- @@ -1549,6 +1556,7 @@ static void SendSetCursorEvent(wxWindowGTK* win, int x, int y) { gs_overrideCursor = &event.GetCursor(); win->GTKUpdateCursor(); + gs_overrideCursor = NULL; gs_needCursorResetMap[win] = true; return; } @@ -2694,8 +2702,44 @@ wxWindowGTK::GTKConnectWidget(const char *signal, wxGTKCallback callback) return g_signal_connect(m_widget, signal, callback, this); } +// GSource callback functions for source used to detect new GDK events +extern "C" { +static gboolean source_prepare(GSource*, int*) +{ + return !gs_isNewEvent; +} + +static gboolean source_check(GSource*) +{ + // 'check' will only be called if 'prepare' returned false + return false; +} + +static gboolean source_dispatch(GSource*, GSourceFunc, void*) +{ + gs_isNewEvent = true; + // don't remove this source + return true; +} +} + void wxWindowGTK::ConnectWidget( GtkWidget *widget ) { + static bool isSourceAttached; + if (!isSourceAttached) + { + // attach GSource to detect new GDK events + isSourceAttached = true; + static GSourceFuncs funcs = { + source_prepare, source_check, source_dispatch, + NULL, NULL, NULL + }; + GSource* source = g_source_new(&funcs, sizeof(GSource)); + // priority slightly higher than GDK_PRIORITY_EVENTS + g_source_set_priority(source, GDK_PRIORITY_EVENTS - 1); + g_source_attach(source, NULL); + } + g_signal_connect (widget, "key_press_event", G_CALLBACK (gtk_window_key_press_callback), this); g_signal_connect (widget, "key_release_event", diff --git a/software/scsi2sd-util/wxWidgets/src/html/htmlwin.cpp b/software/scsi2sd-util/wxWidgets/src/html/htmlwin.cpp index f9c78d6a..bdace997 100644 --- a/software/scsi2sd-util/wxWidgets/src/html/htmlwin.cpp +++ b/software/scsi2sd-util/wxWidgets/src/html/htmlwin.cpp @@ -470,12 +470,12 @@ bool wxHtmlWindow::DoSetPage(const wxString& source) } // ...and run the parser on it: - wxClientDC *dc = new wxClientDC(this); - dc->SetMapMode(wxMM_TEXT); + wxClientDC dc(this); + dc.SetMapMode(wxMM_TEXT); SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF)); SetBackgroundImage(wxNullBitmap); - m_Parser->SetDC(dc); + m_Parser->SetDC(&dc); // notice that it's important to set m_Cell to NULL here before calling // Parse() below, even if it will be overwritten by its return value as @@ -484,7 +484,11 @@ bool wxHtmlWindow::DoSetPage(const wxString& source) wxDELETE(m_Cell); m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc); - delete dc; + + // The parser doesn't need the DC any more, so ensure it's not left with a + // dangling pointer after the DC object goes out of scope. + m_Parser->SetDC(NULL); + m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER); CreateLayout(); diff --git a/software/scsi2sd-util/wxWidgets/src/msw/anybutton.cpp b/software/scsi2sd-util/wxWidgets/src/msw/anybutton.cpp index 870ad052..b5d6dc84 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/anybutton.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/anybutton.cpp @@ -211,7 +211,8 @@ public: // we must be constructed with the size of our images as we need to create // the image list wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap) - : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */, + : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), + !bitmap.HasAlpha() /* use mask only if no alpha */, wxAnyButton::State_Max + 1 /* see "pulse" comment below */), m_hwndBtn(GetHwndOf(btn)) { @@ -831,7 +832,12 @@ wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state) if ( state & ODS_DISABLED ) return wxAnyButton::State_Disabled; - if ( state & ODS_SELECTED ) + // We need to check for the pressed state of the button itself before the + // other checks because even if it is selected or current, it it still + // pressed first and foremost. + const wxAnyButton::State btnState = btn->GetNormalState(); + + if ( btnState == wxAnyButton::State_Pressed || state & ODS_SELECTED ) return wxAnyButton::State_Pressed; if ( btn->HasCapture() || btn->IsMouseInWindow() ) @@ -840,7 +846,7 @@ wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state) if ( state & ODS_FOCUS ) return wxAnyButton::State_Focused; - return btn->GetNormalState(); + return btnState; } void DrawButtonText(HDC hdc, diff --git a/software/scsi2sd-util/wxWidgets/src/msw/bitmap.cpp b/software/scsi2sd-util/wxWidgets/src/msw/bitmap.cpp index a58283f8..a0abcad0 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/bitmap.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/bitmap.cpp @@ -339,6 +339,60 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const return new wxBitmapRefData(*static_cast(data)); } +// Premultiply the values of all RGBA pixels in the given range. +static void PremultiplyPixels(unsigned char* begin, unsigned char* end) +{ + for ( unsigned char* pixels = begin; pixels < end; pixels += 4 ) + { + const unsigned char a = pixels[3]; + + pixels[0] = ((pixels[0]*a) + 127)/255; + pixels[1] = ((pixels[1]*a) + 127)/255; + pixels[2] = ((pixels[2]*a) + 127)/255; + } +} + +// Helper which examines the alpha channel for any non-0 values and also +// possibly returns the DIB with premultiplied values if it does have alpha +// (i.e. this DIB is only filled if the function returns true). +// +// The function semantics is complicated but necessary to avoid converting to +// DIB twice, which is expensive for large bitmaps, yet avoid code duplication +// between CopyFromIconOrCursor() and MSWUpdateAlpha(). +static bool CheckAlpha(HBITMAP hbmp, HBITMAP* hdib = NULL) +{ + BITMAP bm; + if ( !::GetObject(hbmp, sizeof(bm), &bm) || (bm.bmBitsPixel != 32) ) + return false; + + wxDIB dib(hbmp); + if ( !dib.IsOk() ) + return false; + + unsigned char* pixels = dib.GetData(); + unsigned char* const end = pixels + 4*dib.GetWidth()*dib.GetHeight(); + for ( ; pixels < end; pixels += 4 ) + { + if ( pixels[3] != 0 ) + { + if ( hdib ) + { + // If we do have alpha, ensure we use premultiplied data for + // our pixels as this is what the bitmaps created in other ways + // do and this is necessary for e.g. AlphaBlend() to work with + // this bitmap. + PremultiplyPixels(dib.GetData(), end); + + *hdib = dib.Detach(); + } + + return true; + } + } + + return false; +} + bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, wxBitmapTransparency transp) { @@ -360,11 +414,24 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, int w = icon.GetWidth(), h = icon.GetHeight(); - refData->m_width = w; - refData->m_height = h; - refData->m_depth = wxDisplayDepth(); - - refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor; + if ( iconInfo.hbmColor ) + { + refData->m_width = w; + refData->m_height = h; + refData->m_depth = wxDisplayDepth(); + refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor; + } + else // we only have monochrome icon/cursor + { + // Then we need to create our own empty bitmap, which will be modified + // by the mask below. + wxDIB dib(w, h, wxDisplayDepth()); + if ( dib.IsOk() ) + { + memset(dib.GetData(), 0, wxDIB::GetLineSize(w, dib.GetDepth())*h); + refData->AssignDIB(dib); + } + } switch ( transp ) { @@ -379,48 +446,14 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, #if wxUSE_WXDIB // If the icon is 32 bits per pixel then it may have alpha channel // data, although there are some icons that are 32 bpp but have no - // alpha... So convert to a DIB and manually check the 4th byte for - // each pixel. + // alpha, so check for this. { - BITMAP bm; - if ( ::GetObject(iconInfo.hbmColor, sizeof(bm), &bm) && - (bm.bmBitsPixel == 32) ) + HBITMAP hdib = 0; + if ( CheckAlpha(iconInfo.hbmColor, &hdib) ) { - wxDIB dib(iconInfo.hbmColor); - if (dib.IsOk()) - { - unsigned char* const pixels = dib.GetData(); - int idx; - for ( idx = 0; idx < w*h*4; idx += 4 ) - { - if (pixels[idx+3] != 0) - { - // If there is an alpha byte that is non-zero - // then set the alpha flag and stop checking - refData->m_hasAlpha = true; - break; - } - } - - if ( refData->m_hasAlpha ) - { - // If we do have alpha, ensure we use premultiplied - // data for our pixels as this is what the bitmaps - // created in other ways do and this is necessary - // for e.g. AlphaBlend() to work with this bitmap. - for ( idx = 0; idx < w*h*4; idx += 4 ) - { - const unsigned char a = pixels[idx+3]; - - pixels[idx] = ((pixels[idx] *a) + 127)/255; - pixels[idx+1] = ((pixels[idx+1]*a) + 127)/255; - pixels[idx+2] = ((pixels[idx+2]*a) + 127)/255; - } - - ::DeleteObject(refData->m_hBitmap); - refData->m_hBitmap = dib.Detach(); - } - } + refData->m_hasAlpha = true; + ::DeleteObject(refData->m_hBitmap); + refData->m_hBitmap = hdib; } } break; @@ -1267,6 +1300,12 @@ bool wxBitmap::HasAlpha() const return GetBitmapData() && GetBitmapData()->m_hasAlpha; } +void wxBitmap::MSWUpdateAlpha() +{ + if ( CheckAlpha(GetHbitmap()) ) + GetBitmapData()->m_hasAlpha = true; +} + // ---------------------------------------------------------------------------- // wxBitmap setters // ---------------------------------------------------------------------------- diff --git a/software/scsi2sd-util/wxWidgets/src/msw/bmpcbox.cpp b/software/scsi2sd-util/wxWidgets/src/msw/bmpcbox.cpp index f6d5950a..469ddace 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/bmpcbox.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/bmpcbox.cpp @@ -441,7 +441,7 @@ bool wxBitmapComboBox::MSWOnDraw(WXDRAWITEMSTRUCT *item) //if ( lpDrawItem->itemState & ODS_FOCUS ) // DrawFocusRect(lpDrawItem->hDC, &lpDrawItem->rcItem); - return TRUE; + return true; } bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) @@ -449,9 +449,14 @@ bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item; int pos = lpMeasureItem->itemID; - lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos); + // Measure item height if item list is not empty, + // otherwise leave default system value. + if ( pos >= 0 ) + { + lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos); + } - return TRUE; + return true; } #endif // wxUSE_BITMAPCOMBOBOX diff --git a/software/scsi2sd-util/wxWidgets/src/msw/calctrl.cpp b/software/scsi2sd-util/wxWidgets/src/msw/calctrl.cpp index ac0d8bbd..8b6f359f 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/calctrl.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/calctrl.cpp @@ -108,7 +108,7 @@ wxCalendarCtrl::Create(wxWindow *parent, } const wxChar * const clsname = s_clsMonthCal.IsRegistered() - ? s_clsMonthCal.GetName().t_str() + ? static_cast(s_clsMonthCal.GetName().t_str()) : MONTHCAL_CLASS; if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) ) diff --git a/software/scsi2sd-util/wxWidgets/src/msw/control.cpp b/software/scsi2sd-util/wxWidgets/src/msw/control.cpp index 4bb6ae84..79aa30a7 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/control.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/control.cpp @@ -372,14 +372,26 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) // If this HWND doesn't correspond to a wxWindow, it still might be // one of its children for which we need to set the background // brush, e.g. this is the case for the EDIT control that is part - // of wxComboBox. Check for this by asking the parent if it has it: - HWND parent = ::GetParent(hWnd); - if ( parent ) + // of wxComboBox but also e.g. of wxSlider label HWNDs which are + // logically part of it, but are siblings of the main control at + // Windows level. + // + // So check whether it's a sibling of this window which is part of + // the same wx object. + if ( ContainsHWND(hWnd) ) { - wxWindow *winParent = wxFindWinFromHandle( parent ); - if( winParent && winParent->ContainsHWND( hWnd ) ) - win = winParent; - } + win = this; + } + else // Or maybe a child sub-window of this one. + { + HWND parent = ::GetParent(hWnd); + if ( parent ) + { + wxWindow *winParent = wxFindWinFromHandle( parent ); + if( winParent && winParent->ContainsHWND( hWnd ) ) + win = winParent; + } + } } if ( win ) diff --git a/software/scsi2sd-util/wxWidgets/src/msw/dc.cpp b/software/scsi2sd-util/wxWidgets/src/msw/dc.cpp index 2910a5a0..abd8956f 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/dc.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/dc.cpp @@ -1037,7 +1037,9 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h wxCoord x2 = x + width; wxCoord y2 = y + height; - wxCoord x2dev = XLOG2DEV(x2), + wxCoord x1dev = XLOG2DEV(x), + y1dev = YLOG2DEV(y), + x2dev = XLOG2DEV(x2), y2dev = YLOG2DEV(y2); // Windows (but not Windows CE) draws the filled rectangles without outline @@ -1046,12 +1048,18 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h #ifndef __WXWINCE__ if ( m_pen.IsTransparent() ) { - x2dev++; + // Right edge to be extended is "displayed right edge" + // and hence its device coordinates depend + // on layout direction and can be either x1 or x2. + if ( GetLayoutDirection() == wxLayout_RightToLeft ) + x1dev--; + else + x2dev++; y2dev++; } #endif // !__WXWINCE__ - (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev); + (void)Rectangle(GetHdc(), x1dev, y1dev, x2dev, y2dev); CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); @@ -1932,6 +1940,50 @@ void ApplyEffectiveScale(double scale, int sign, int *device, int *logical) *logical = sign*wxRound(VIEWPORT_EXTENT/scale); } +// Binary GCD algorithm +// See: http://en.wikipedia.org/wiki/Binary_GCD_algorithm#Iterative_version_in_C +unsigned int CalcGCD(unsigned int u, unsigned int v) +{ + // GCD(0,v) == v; GCD(u,0) == u, GCD(0,0) == 0 + if (u == 0) + return v; + if (v == 0) + return u; + + int shift; + + // Let shift := lg K, where K is the greatest power of 2 + // dividing both u and v. + for (shift = 0; ((u | v) & 1) == 0; ++shift) + { + u >>= 1; + v >>= 1; + } + + while ((u & 1) == 0) + u >>= 1; + + // From here on, u is always odd. + do + { + // remove all factors of 2 in v -- they are not common + // note: v is not zero, so while will terminate + while ((v & 1) == 0) + v >>= 1; + + // Now u and v are both odd. Swap if necessary so u <= v, + // then set v = v - u (which is even) + if (u > v) + { + wxSwap(u, v); + } + v -= u; // Here v >= u + } while (v != 0); + + // restore common factors of 2 + return u << shift; +} + } // anonymous namespace void wxMSWDCImpl::RealizeScaleAndOrigin() @@ -1952,6 +2004,16 @@ void wxMSWDCImpl::RealizeScaleAndOrigin() ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX); ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY); + // Becaue only devExtX/logExtX ratio and devExtY/logExtY ratio are counted + // we can reduce the fractions to avoid large absolute numbers + // and possible arithmetic overflows. + unsigned int gcd = CalcGCD(abs(devExtX), abs(logExtX)); + devExtX /= gcd; + logExtX /= gcd; + gcd = CalcGCD(abs(devExtY), abs(logExtY)); + devExtY /= gcd; + logExtY /= gcd; + ::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL); ::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL); diff --git a/software/scsi2sd-util/wxWidgets/src/msw/dirdlg.cpp b/software/scsi2sd-util/wxWidgets/src/msw/dirdlg.cpp index 549adec9..4f2c898d 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/dirdlg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/dirdlg.cpp @@ -386,17 +386,26 @@ int wxDirDialog::ShowIFileDialog(WXHWND owner) NULL, wxIID_PPV_ARGS(IShellItem, &folder)); + + // Failing to parse the folder name is not really an error, we'll just + // ignore the initial directory in this case, but we should still show + // the dialog. if ( FAILED(hr) ) { - wxLogApiError(wxS("SHCreateItemFromParsingName"), hr); - return wxID_NONE; + if ( hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) ) + { + wxLogApiError(wxS("SHCreateItemFromParsingName"), hr); + return wxID_NONE; + } } - - hr = fileDialog->SetFolder(folder); - if ( FAILED(hr) ) + else // The folder was parsed correctly. { - wxLogApiError(wxS("IFileDialog::SetFolder"), hr); - return wxID_NONE; + hr = fileDialog->SetFolder(folder); + if ( FAILED(hr) ) + { + wxLogApiError(wxS("IFileDialog::SetFolder"), hr); + return wxID_NONE; + } } } diff --git a/software/scsi2sd-util/wxWidgets/src/msw/font.cpp b/software/scsi2sd-util/wxWidgets/src/msw/font.cpp index 6c747e82..78786d14 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/font.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/font.cpp @@ -360,7 +360,7 @@ void wxFontRefData::Init(int pointSize, if ( m_sizeUsingPixels ) SetPixelSize(pixelSize); else - SetPointSize(pointSize); + SetPointSize(pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize); SetStyle(style); SetWeight(weight); @@ -841,7 +841,7 @@ bool wxFont::DoCreate(int pointSize, // wxDEFAULT is a valid value for the font size too so we must treat it // specially here (otherwise the size would be 70 == wxDEFAULT value) - if ( pointSize == wxDEFAULT || pointSize == -1 ) + if ( pointSize == wxDEFAULT ) { pointSize = wxNORMAL_FONT->GetPointSize(); } diff --git a/software/scsi2sd-util/wxWidgets/src/msw/frame.cpp b/software/scsi2sd-util/wxWidgets/src/msw/frame.cpp index 8c1b1786..11342045 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/frame.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/frame.cpp @@ -286,6 +286,13 @@ void wxFrame::PositionStatusBar() int w, h; GetClientSize(&w, &h); + // Resize the status bar to its default height, as it could have been set + // to a wrong value before by WM_SIZE sent during the frame creation and + // our status bars preserve their programmatically set size to avoid being + // resized by DefWindowProc() to the full window width, so if we didn't do + // this here, the status bar would retain the possibly wrong current height. + m_frameStatusBar->SetSize(wxDefaultSize, wxSIZE_AUTO_HEIGHT); + int sw, sh; m_frameStatusBar->GetSize(&sw, &sh); diff --git a/software/scsi2sd-util/wxWidgets/src/msw/graphics.cpp b/software/scsi2sd-util/wxWidgets/src/msw/graphics.cpp index e46c3709..c0ce6da1 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/graphics.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/graphics.cpp @@ -289,7 +289,9 @@ protected: private: // common part of Create{Linear,Radial}GradientBrush() template - void SetGradientStops(T *brush, const wxGraphicsGradientStops& stops); + void SetGradientStops(T *brush, + const wxGraphicsGradientStops& stops, + bool reversed = false); Brush* m_brush; Image* m_brushImage; @@ -857,7 +859,8 @@ void wxGDIPlusBrushData::Init() template void wxGDIPlusBrushData::SetGradientStops(T *brush, - const wxGraphicsGradientStops& stops) + const wxGraphicsGradientStops& stops, + bool reversed) { const unsigned numStops = stops.GetCount(); if ( numStops <= 2 ) @@ -870,12 +873,25 @@ wxGDIPlusBrushData::SetGradientStops(T *brush, wxVector colors(numStops); wxVector positions(numStops); - for ( unsigned i = 0; i < numStops; i++ ) + if ( reversed ) { - wxGraphicsGradientStop stop = stops.Item(i); + for ( unsigned i = 0; i < numStops; i++ ) + { + wxGraphicsGradientStop stop = stops.Item(numStops - i - 1); - colors[i] = wxColourToColor(stop.GetColour()); - positions[i] = stop.GetPosition(); + colors[i] = wxColourToColor(stop.GetColour()); + positions[i] = 1.0 - stop.GetPosition(); + } + } + else + { + for ( unsigned i = 0; i < numStops; i++ ) + { + wxGraphicsGradientStop stop = stops.Item(i); + + colors[i] = wxColourToColor(stop.GetColour()); + positions[i] = stop.GetPosition(); + } } brush->SetInterpolationColors(&colors[0], &positions[0], numStops); @@ -914,7 +930,9 @@ wxGDIPlusBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, int count = 1; brush->SetSurroundColors(&col, &count); - SetGradientStops(brush, stops); + // Because the GDI+ API draws radial gradients from outside towards the + // center we have to reverse the order of the gradient stops. + SetGradientStops(brush, stops, true); } //----------------------------------------------------------------------------- diff --git a/software/scsi2sd-util/wxWidgets/src/msw/imaglist.cpp b/software/scsi2sd-util/wxWidgets/src/msw/imaglist.cpp index 7e100c32..37b308c7 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/imaglist.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/imaglist.cpp @@ -374,7 +374,6 @@ bool wxImageList::Draw(int index, // Get the bitmap wxBitmap wxImageList::GetBitmap(int index) const { -#if wxUSE_WXDIB && wxUSE_IMAGE int bmp_width = 0, bmp_height = 0; GetSize(index, bmp_width, bmp_height); @@ -382,29 +381,50 @@ wxBitmap wxImageList::GetBitmap(int index) const wxMemoryDC dc; dc.SelectObject(bitmap); - // draw it the first time to find a suitable mask colour - ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT); - dc.SelectObject(wxNullBitmap); - - // find the suitable mask colour - wxImage image = bitmap.ConvertToImage(); - unsigned char r = 0, g = 0, b = 0; - image.FindFirstUnusedColour(&r, &g, &b); - - // redraw whole image and bitmap in the mask colour - image.Create(bmp_width, bmp_height); - image.Replace(0, 0, 0, r, g, b); - bitmap = wxBitmap(image); - - // redraw icon over the mask colour to actually draw it - dc.SelectObject(bitmap); - ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT); - dc.SelectObject(wxNullBitmap); - - // get the image, set the mask colour and convert back to get transparent bitmap - image = bitmap.ConvertToImage(); - image.SetMaskColour(r, g, b); - bitmap = wxBitmap(image); +#if wxUSE_WXDIB && wxUSE_IMAGE + IMAGEINFO ii; + ImageList_GetImageInfo(GetHImageList(), index, &ii); + if ( ii.hbmMask ) + { + // draw it the first time to find a suitable mask colour + ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT); + dc.SelectObject(wxNullBitmap); + + // find the suitable mask colour + wxImage image = bitmap.ConvertToImage(); + unsigned char r = 0, g = 0, b = 0; + image.FindFirstUnusedColour(&r, &g, &b); + + // redraw whole image and bitmap in the mask colour + image.Create(bmp_width, bmp_height); + image.Replace(0, 0, 0, r, g, b); + bitmap = wxBitmap(image); + + // redraw icon over the mask colour to actually draw it + dc.SelectObject(bitmap); + ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT); + dc.SelectObject(wxNullBitmap); + + // get the image, set the mask colour and convert back to get transparent bitmap + image = bitmap.ConvertToImage(); + image.SetMaskColour(r, g, b); + bitmap = wxBitmap(image); + } + else // no mask + { + // Just draw it normally. + ((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL); + dc.SelectObject(wxNullBitmap); + + // And adjust its alpha flag as the destination bitmap would get it if + // the source one had it. + // + // Note that perhaps we could just call UseAlpha() which would set the + // "has alpha" flag unconditionally as it doesn't seem to do any harm, + // but for now only do it if necessary, just to be on the safe side, + // even if it requires more work (and takes more time). + bitmap.MSWUpdateAlpha(); + } #else wxBitmap bitmap; #endif diff --git a/software/scsi2sd-util/wxWidgets/src/msw/menu.cpp b/software/scsi2sd-util/wxWidgets/src/msw/menu.cpp index cdc229ff..88682ec4 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/menu.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/menu.cpp @@ -360,7 +360,7 @@ wxMenu::~wxMenu() // we should free Windows resources only if Windows doesn't do it for us // which happens if we're attached to a menubar or a submenu of another // menu - if ( !IsAttached() && !GetParent() ) + if ( m_hMenu && !IsAttached() && !GetParent() ) { if ( !::DestroyMenu(GetHmenu()) ) { diff --git a/software/scsi2sd-util/wxWidgets/src/msw/menuitem.cpp b/software/scsi2sd-util/wxWidgets/src/msw/menuitem.cpp index 3c09d878..7d10a044 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/menuitem.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/menuitem.cpp @@ -671,14 +671,11 @@ void wxMenuItem::SetItemLabel(const wxString& txt) m_parentMenu->UpdateAccel(this); #endif // wxUSE_ACCEL - const UINT id = GetMSWId(); - HMENU hMenu = GetHMenuOf(m_parentMenu); - if ( !hMenu ) + const int itemPos = MSGetMenuItemPos(); + if ( itemPos == -1 ) return; - const UINT state = ::GetMenuState(hMenu, id, MF_BYCOMMAND); - if ( state == (UINT)-1 ) - return; + HMENU hMenu = GetHMenuOf(m_parentMenu); // update the text of the native menu item WinStruct info; @@ -696,7 +693,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt) info.fMask |= MIIM_BITMAP | MIIM_FTYPE; else info.fMask |= MIIM_TYPE; - if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) ) + if ( !::GetMenuItemInfo(hMenu, itemPos, TRUE, &info) ) { wxLogLastError(wxT("GetMenuItemInfo")); return; @@ -716,7 +713,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt) // Also notice that we shouldn't use our IsOwnerDrawn() because it can be // true because it was set by e.g. SetBitmap(), even if the item wasn't // made owner drawn at Windows level. - if ( !(state & MF_OWNERDRAW) ) + if ( !(info.fState & MF_OWNERDRAW) ) #endif // wxUSE_OWNER_DRAWN { if ( isLaterThanWin95 ) @@ -726,7 +723,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt) info.cch = m_text.length(); } - if ( !::SetMenuItemInfo(hMenu, id, FALSE, &info) ) + if ( !::SetMenuItemInfo(hMenu, itemPos, TRUE, &info) ) { wxLogLastError(wxT("SetMenuItemInfo")); } @@ -1251,6 +1248,42 @@ void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& co } #endif // wxUSE_OWNER_DRAWN +int wxMenuItem::MSGetMenuItemPos() const +{ + if ( !m_parentMenu ) + return -1; + + const HMENU hMenu = GetHMenuOf(m_parentMenu); + if ( !hMenu ) + return -1; + + const UINT id = GetMSWId(); + const int menuItems = ::GetMenuItemCount(hMenu); + for ( int i = 0; i < menuItems; i++ ) + { + const UINT state = ::GetMenuState(hMenu, i, MF_BYPOSITION); + if ( state == (UINT)-1 ) + { + // This indicates that the item at this position and is not + // supposed to happen here, but test for it just in case. + continue; + } + + if ( state & MF_POPUP ) + { + if ( ::GetSubMenu(hMenu, i) == (HMENU)id ) + return i; + } + else if ( !(state & MF_SEPARATOR) ) + { + if ( ::GetMenuItemID(hMenu, i) == id ) + return i; + } + } + + return -1; +} + // ---------------------------------------------------------------------------- // wxMenuItemBase // ---------------------------------------------------------------------------- diff --git a/software/scsi2sd-util/wxWidgets/src/msw/printdlg.cpp b/software/scsi2sd-util/wxWidgets/src/msw/printdlg.cpp index 63826efb..629df49c 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/printdlg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/printdlg.cpp @@ -413,6 +413,13 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi NULL, // these are not used. 0 ); // Zero returns buffer size. + // Some buggy printer drivers (see #16274 which claims that Kyocera + // PCL6 driver does this) seem to return a too small value from + // DocumentProperties(), resulting in a crash because when we call + // it with DM_OUT_BUFFER below, memory beyond the allocated buffer + // is overwritten. So add a bit of extra memory to work around this. + dwNeeded += 1024; + LPDEVMODE tempDevMode = static_cast( GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, dwNeeded ) ); // Step 2: diff --git a/software/scsi2sd-util/wxWidgets/src/msw/statbox.cpp b/software/scsi2sd-util/wxWidgets/src/msw/statbox.cpp index 678a2594..9a5637c0 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/statbox.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/statbox.cpp @@ -76,9 +76,6 @@ bool wxStaticBox::Create(wxWindow *parent, if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) return false; - // Always use LTR layout. Otherwise, the label would be mirrored. - SetLayoutDirection(wxLayout_LeftToRight); - #ifndef __WXWINCE__ if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) { @@ -117,12 +114,6 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const styleWin |= BS_GROUPBOX; - if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) - { - // Make sure label is on the right - styleWin |= BS_RIGHT; - } - return styleWin; } @@ -277,11 +268,26 @@ void wxStaticBox::MSWGetRegionWithoutSelf(WXHRGN hRgn, int w, int h) SubtractRectFromRgn(hrgn, w - border, 0, w, h); } +namespace { +RECT AdjustRectForRtl(wxLayoutDirection dir, RECT const& childRect, RECT const& boxRect) { + RECT ret = childRect; + if( dir == wxLayout_RightToLeft ) { + // The clipping region too is mirrored in RTL layout. + // We need to mirror screen coordinates relative to static box window priot to + // intersecting with region. + ret.right = boxRect.right - childRect.left - boxRect.left; + ret.left = boxRect.right - childRect.right - boxRect.left; + } + + return ret; +} +} + WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() { - RECT rc; - ::GetWindowRect(GetHwnd(), &rc); - HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); + RECT boxRc; + ::GetWindowRect(GetHwnd(), &boxRc); + HRGN hrgn = ::CreateRectRgn(boxRc.left, boxRc.top, boxRc.right + 1, boxRc.bottom + 1); bool foundThis = false; // Iterate over all sibling windows as in the old wxWidgets API the @@ -320,7 +326,9 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() continue; } + RECT rc; ::GetWindowRect(child, &rc); + rc = AdjustRectForRtl(GetLayoutDirection(), rc, boxRc ); if ( ::RectInRegion(hrgn, &rc) ) { // need to remove WS_CLIPSIBLINGS from all sibling windows @@ -355,7 +363,9 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() continue; } + RECT rc; ::GetWindowRect(child, &rc); + rc = AdjustRectForRtl(GetLayoutDirection(), rc, boxRc ); AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc)); ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF); } @@ -391,7 +401,7 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc) ::FillRect(GetHdcOf(*impl), &rc, hbr); } -void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) +void wxStaticBox::PaintForeground(wxDC& dc, const RECT&) { wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0); @@ -407,10 +417,6 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) HDC hdc = GetHdcOf(*impl); ::SetTextColor(hdc, GetForegroundColour().GetPixel()); - const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft; - if ( rtl ) - ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT); - // Get dimensions of the label const wxString label = GetLabel(); @@ -458,18 +464,9 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) // FIXME: value of x is hardcoded as this is what it is on my system, // no idea if it's true everywhere RECT dimensions = {0, 0, 0, y}; - if ( !rtl ) - { - x = 9; - dimensions.left = x; - dimensions.right = x + width; - } - else - { - x = rc.right - 7; - dimensions.left = x - width; - dimensions.right = x; - } + x = 9; + dimensions.left = x; + dimensions.right = x + width; // need to adjust the rectangle to cover all the label background dimensions.left -= 2; @@ -505,18 +502,9 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) } // now draw the text - if ( !rtl ) - { - RECT rc2 = { x, 0, x + width, y }; - ::DrawText(hdc, label.t_str(), label.length(), &rc2, - drawTextFlags); - } - else // RTL - { - RECT rc2 = { x, 0, x - width, y }; - ::DrawText(hdc, label.t_str(), label.length(), &rc2, - drawTextFlags | DT_RTLREADING); - } + RECT rc2 = { x, 0, x + width, y }; + ::DrawText(hdc, label.t_str(), label.length(), &rc2, + drawTextFlags); } #endif // wxUSE_UXTHEME } @@ -525,9 +513,10 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) { RECT rc; ::GetClientRect(GetHwnd(), &rc); + wxPaintDC dc(this); // draw the entire box in a memory DC - wxMemoryDC memdc; + wxMemoryDC memdc(&dc); wxBitmap bitmap(rc.right, rc.bottom); memdc.SelectObject(bitmap); @@ -540,7 +529,6 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) // note that it seems to be faster to do 4 small blits here and then paint // directly into wxPaintDC than painting background in wxMemoryDC and then // blitting everything at once to wxPaintDC, this is why we do it like this - wxPaintDC dc(this); int borderTop, border; GetBordersForSizer(&borderTop, &border); diff --git a/software/scsi2sd-util/wxWidgets/src/msw/textctrl.cpp b/software/scsi2sd-util/wxWidgets/src/msw/textctrl.cpp index 473aa0c3..bf3b3b2f 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/textctrl.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/textctrl.cpp @@ -40,6 +40,7 @@ #include "wx/wxcrtvararg.h" #endif +#include "wx/scopedptr.h" #include "wx/stack.h" #include "wx/sysopt.h" @@ -68,8 +69,11 @@ // richedit.h at all #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) #include + #include #endif +#include "wx/msw/ole/oleutils.h" + #endif // wxUSE_RICHEDIT #include "wx/msw/missing.h" @@ -88,6 +92,25 @@ static wxDropTarget * #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT +#if wxUSE_OLE +// This must be the last header included to only affect the DEFINE_GUID() +// occurrences below but not any GUIDs declared in the standard files included +// above. +#include + +namespace +{ + +// Normally the IRichEditOleCallback interface and its IID are defined in +// richole.h header file included in the platform SDK but MinGW doesn't +// have the IID symbol (but does have the interface). Work around it by +// defining it ourselves. +DEFINE_GUID(wxIID_IRichEditOleCallback, + 0x00020d03, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); + +} // anonymous namespace +#endif // wxUSE_OLE + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -138,6 +161,73 @@ bool wxRichEditModule::ms_inkEditLibLoadAttemped = false; IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule) +#if wxUSE_OLE + +extern wxMenu *wxCurrentPopupMenu; + +class wxTextCtrlOleCallback : public IRichEditOleCallback +{ +public: + wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {} + ~wxTextCtrlOleCallback() { DeleteContextMenuObject(); } + + STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) { return E_NOTIMPL; } + STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) { return E_NOTIMPL; } + STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) { return E_NOTIMPL; } + STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) { return E_NOTIMPL; } + STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) { return E_NOTIMPL; } + STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) { return E_NOTIMPL; } + STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) { return E_NOTIMPL; } + STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) { return E_NOTIMPL; } + STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) { return E_NOTIMPL; } + + STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) + { + // 'menu' will be shown and destroyed by the caller. We need to keep + // its wx counterpart, the wxMenu instance, around until it is + // dismissed, though, so store it in m_menu and destroy sometime later. + DeleteContextMenuObject(); + m_menu = m_textCtrl->MSWCreateContextMenu(); + *menu = m_menu->GetHMenu(); + + // Make wx handle events from the popup menu correctly: + m_menu->SetInvokingWindow(m_textCtrl); + wxCurrentPopupMenu = m_menu; + + m_menu->UpdateUI(); + + return S_OK; + } + + DECLARE_IUNKNOWN_METHODS; + +private: + void DeleteContextMenuObject() + { + if ( m_menu ) + { + m_menu->MSWDetachHMENU(); + if ( wxCurrentPopupMenu == m_menu ) + wxCurrentPopupMenu = NULL; + wxDELETE(m_menu); + } + } + + wxTextCtrl *m_textCtrl; + wxMenu *m_menu; + + wxDECLARE_NO_COPY_CLASS(wxTextCtrlOleCallback); +}; + +BEGIN_IID_TABLE(wxTextCtrlOleCallback) + ADD_IID(Unknown) + ADD_RAW_IID(wxIID_IRichEditOleCallback) +END_IID_TABLE; + +IMPLEMENT_IUNKNOWN_METHODS(wxTextCtrlOleCallback) + +#endif // wxUSE_OLE + #endif // wxUSE_RICHEDIT // a small class used to set m_updatesCount to 0 (to filter duplicate events if @@ -198,10 +288,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_KEY_DOWN(wxTextCtrl::OnKeyDown) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) -#if wxUSE_RICHEDIT - EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu) -#endif - EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy) EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) @@ -492,6 +578,17 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, } ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask); + + bool contextMenuConnected = false; +#if wxUSE_OLE + if ( m_verRichEdit >= 4 ) + { + wxTextCtrlOleCallback *cb = new wxTextCtrlOleCallback(this); + contextMenuConnected = ::SendMessage(GetHwnd(), EM_SETOLECALLBACK, 0, (LPARAM)cb) != 0; + } +#endif + if ( !contextMenuConnected ) + Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(wxTextCtrl::OnContextMenu)); } else #endif // wxUSE_RICHEDIT @@ -2323,32 +2420,6 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) event.Enable( !IsEmpty() ); } -void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) -{ -#if wxUSE_RICHEDIT - if (IsRich()) - { - if (!m_privateContextMenu) - { - m_privateContextMenu = new wxMenu; - m_privateContextMenu->Append(wxID_UNDO, _("&Undo")); - m_privateContextMenu->Append(wxID_REDO, _("&Redo")); - m_privateContextMenu->AppendSeparator(); - m_privateContextMenu->Append(wxID_CUT, _("Cu&t")); - m_privateContextMenu->Append(wxID_COPY, _("&Copy")); - m_privateContextMenu->Append(wxID_PASTE, _("&Paste")); - m_privateContextMenu->Append(wxID_CLEAR, _("&Delete")); - m_privateContextMenu->AppendSeparator(); - m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All")); - } - PopupMenu(m_privateContextMenu); - return; - } - else -#endif - event.Skip(); -} - void wxTextCtrl::OnSetFocus(wxFocusEvent& event) { // be sure the caret remains invisible if the user had hidden it @@ -2363,6 +2434,34 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event) // the rest of the file only deals with the rich edit controls #if wxUSE_RICHEDIT +void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) +{ + if (IsRich()) + { + if (!m_privateContextMenu) + m_privateContextMenu = MSWCreateContextMenu(); + PopupMenu(m_privateContextMenu); + return; + } + else + event.Skip(); +} + +wxMenu *wxTextCtrl::MSWCreateContextMenu() +{ + wxMenu *m = new wxMenu; + m->Append(wxID_UNDO, _("&Undo")); + m->Append(wxID_REDO, _("&Redo")); + m->AppendSeparator(); + m->Append(wxID_CUT, _("Cu&t")); + m->Append(wxID_COPY, _("&Copy")); + m->Append(wxID_PASTE, _("&Paste")); + m->Append(wxID_CLEAR, _("&Delete")); + m->AppendSeparator(); + m->Append(wxID_SELECTALL, _("Select &All")); + return m; +} + // ---------------------------------------------------------------------------- // EN_LINK processing // ---------------------------------------------------------------------------- @@ -2718,6 +2817,24 @@ bool wxTextCtrl::MSWSetParaFormat(const wxTextAttr& style, long start, long end) } } +#if wxUSE_RICHEDIT2 + if ( style.HasParagraphSpacingAfter() ) + { + pf.dwMask |= PFM_SPACEAFTER; + + // Convert from 1/10 mm to TWIPS + pf.dySpaceAfter = (int) (((double) style.GetParagraphSpacingAfter()) * mm2twips / 10.0) ; + } + + if ( style.HasParagraphSpacingBefore() ) + { + pf.dwMask |= PFM_SPACEBEFORE; + + // Convert from 1/10 mm to TWIPS + pf.dySpaceBefore = (int) (((double) style.GetParagraphSpacingBefore()) * mm2twips / 10.0) ; + } +#endif // wxUSE_RICHEDIT2 + #if wxUSE_RICHEDIT2 if ( m_verRichEdit > 1 ) { diff --git a/software/scsi2sd-util/wxWidgets/src/msw/treectrl.cpp b/software/scsi2sd-util/wxWidgets/src/msw/treectrl.cpp index 9cb47cd9..754ea316 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/treectrl.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/treectrl.cpp @@ -3277,7 +3277,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case TVN_BEGINLABELEDIT: { eventType = wxEVT_TREE_BEGIN_LABEL_EDIT; - TV_DISPINFO *info = (TV_DISPINFO *)lParam; + NMTVDISPINFO *info = (NMTVDISPINFO *)lParam; // although the user event handler may still veto it, it is // important to set it now so that calls to SetItemText() from @@ -3311,7 +3311,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case TVN_ENDLABELEDIT: { eventType = wxEVT_TREE_END_LABEL_EDIT; - TV_DISPINFO *info = (TV_DISPINFO *)lParam; + NMTVDISPINFO *info = (NMTVDISPINFO *)lParam; event.m_item = info->item.hItem; event.m_label = info->item.pszText; @@ -3355,7 +3355,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_TREE_SET_INFO; //else: get, already set above - TV_DISPINFO *info = (TV_DISPINFO *)lParam; + NMTVDISPINFO *info = (NMTVDISPINFO *)lParam; event.m_item = info->item.hItem; break; @@ -3857,7 +3857,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) //if ( /* !processed && */ ) { wxTreeItemId item = event.m_item; - TV_DISPINFO *info = (TV_DISPINFO *)lParam; + NMTVDISPINFO *info = (NMTVDISPINFO *)lParam; const wxTreeItemParam * const param = GetItemParam(item); if ( !param ) diff --git a/software/scsi2sd-util/wxWidgets/src/msw/utils.cpp b/software/scsi2sd-util/wxWidgets/src/msw/utils.cpp index 33322697..df4ec5ff 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/utils.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/utils.cpp @@ -1488,6 +1488,13 @@ wxWinVersion wxGetWinVersion() case 2: return wxWinVersion_8; + + case 3: + // For now, map to wxWinVersion_8. In case program + // does not have a manifest indicating 8.1 + // support, Windows already performs this mapping + // for us. + return wxWinVersion_8; } break; } diff --git a/software/scsi2sd-util/wxWidgets/src/msw/webview_ie.cpp b/software/scsi2sd-util/wxWidgets/src/msw/webview_ie.cpp index 9a3d3ea0..74d1236c 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/webview_ie.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/webview_ie.cpp @@ -960,13 +960,13 @@ bool wxWebViewIE::IsElementVisible(wxCOMPtr elm) { //Check if the object has the style display:none. if((style->get_display(&tmp_bstr) != S_OK) || - (tmp_bstr != NULL && (_wcsicmp(tmp_bstr, L"none") == 0))) + (tmp_bstr != NULL && (wxCRT_StricmpW(tmp_bstr, L"none") == 0))) { is_visible = false; } //Check if the object has the style visibility:hidden. if((is_visible && (style->get_visibility(&tmp_bstr) != S_OK)) || - (tmp_bstr != NULL && _wcsicmp(tmp_bstr, L"hidden") == 0)) + (tmp_bstr != NULL && wxCRT_StricmpW(tmp_bstr, L"hidden") == 0)) { is_visible = false; } diff --git a/software/scsi2sd-util/wxWidgets/src/msw/window.cpp b/software/scsi2sd-util/wxWidgets/src/msw/window.cpp index 0e3f79e4..55e8e948 100644 --- a/software/scsi2sd-util/wxWidgets/src/msw/window.cpp +++ b/software/scsi2sd-util/wxWidgets/src/msw/window.cpp @@ -1145,6 +1145,11 @@ void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir) if ( styleNew != styleOld ) { wxSetWindowExStyle(this, styleNew); + + // Update layout: whether we have children or are drawing something, we + // need to redo it with the new layout. + SendSizeEvent(); + Refresh(); } #endif } @@ -1837,31 +1842,18 @@ void wxWindowMSW::DoGetPosition(int *x, int *y) const { RECT rect = wxGetWindowRect(GetHwnd()); - POINT point; - point.x = rect.left; - point.y = rect.top; - // we do the adjustments with respect to the parent only for the "real" // children, not for the dialogs/frames if ( !IsTopLevel() ) { - if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) - { - // In RTL mode, we want the logical left x-coordinate, - // which would be the physical right x-coordinate. - point.x = rect.right; - } - - // Since we now have the absolute screen coords, if there's a - // parent we must subtract its top left corner - if ( parent ) - { - ::ScreenToClient(GetHwndOf(parent), &point); - } + // In RTL mode, we want the logical left x-coordinate, + // which would be the physical right x-coordinate. + ::MapWindowPoints(NULL, parent ? GetHwndOf(parent) : HWND_DESKTOP, + (LPPOINT)&rect, 2); } - pos.x = point.x; - pos.y = point.y; + pos.x = rect.left; + pos.y = rect.top; } // we also must adjust by the client area offset: a control which is just @@ -2128,11 +2120,11 @@ wxSize wxWindowMSW::DoGetBorderSize() const break; case wxBORDER_SUNKEN: + case wxBORDER_THEME: border = 2; break; case wxBORDER_RAISED: - case wxBORDER_DOUBLE: border = 3; break; @@ -2450,7 +2442,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) } } - if ( btn && btn->IsEnabled() ) + if ( btn && btn->IsEnabled() && btn->IsShownOnScreen() ) { btn->MSWCommand(BN_CLICKED, 0 /* unused */); return true; @@ -2499,7 +2491,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) } } - if ( ::IsDialogMessage(GetHwnd(), msg) ) + if ( MSWSafeIsDialogMessage(msg) ) { // IsDialogMessage() did something... return true; @@ -2530,12 +2522,16 @@ bool wxWindowMSW::MSWTranslateMessage(WXMSG* pMsg) #endif // wxUSE_ACCEL } -bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg) +bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* WXUNUSED(msg)) { - // all tests below have to deal with various bugs/misfeatures of - // IsDialogMessage(): we have to prevent it from being called from our - // MSWProcessMessage() in some situations + // We don't have any reason to not preprocess messages at this level. + return true; +} +#ifndef __WXUNIVERSAL__ + +bool wxWindowMSW::MSWSafeIsDialogMessage(WXMSG* msg) +{ // don't let IsDialogMessage() get VK_ESCAPE as it _always_ eats the // message even when there is no cancel button and when the message is // needed by the control itself: in particular, it prevents the tree in @@ -2549,48 +2545,45 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg) // going into an infinite loop when it tries to find the control to give // focus to when Alt- is pressed, so we try to detect [some of] the // situations when this may happen and not call it then - if ( msg->message != WM_SYSCHAR ) - return true; - - // assume we can call it by default - bool canSafelyCallIsDlgMsg = true; - - HWND hwndFocus = ::GetFocus(); + if ( msg->message == WM_SYSCHAR ) + { + HWND hwndFocus = ::GetFocus(); - // if the currently focused window itself has WS_EX_CONTROLPARENT style, - // ::IsDialogMessage() will also enter an infinite loop, because it will - // recursively check the child windows but not the window itself and so if - // none of the children accepts focus it loops forever (as it only stops - // when it gets back to the window it started from) - // - // while it is very unusual that a window with WS_EX_CONTROLPARENT - // style has the focus, it can happen. One such possibility is if - // all windows are either toplevel, wxDialog, wxPanel or static - // controls and no window can actually accept keyboard input. + // if the currently focused window itself has WS_EX_CONTROLPARENT style, + // ::IsDialogMessage() will also enter an infinite loop, because it will + // recursively check the child windows but not the window itself and so if + // none of the children accepts focus it loops forever (as it only stops + // when it gets back to the window it started from) + // + // while it is very unusual that a window with WS_EX_CONTROLPARENT + // style has the focus, it can happen. One such possibility is if + // all windows are either toplevel, wxDialog, wxPanel or static + // controls and no window can actually accept keyboard input. #if !defined(__WXWINCE__) - if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT ) - { - // pessimistic by default - canSafelyCallIsDlgMsg = false; - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT ) { - wxWindow * const win = node->GetData(); - if ( win->CanAcceptFocus() && - !wxHasWindowExStyle(win, WS_EX_CONTROLPARENT) ) + // pessimistic by default + bool canSafelyCallIsDlgMsg = false; + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) { - // it shouldn't hang... - canSafelyCallIsDlgMsg = true; + wxWindow * const win = node->GetData(); + if ( win->CanAcceptFocus() && + !wxHasWindowExStyle(win, WS_EX_CONTROLPARENT) ) + { + // it shouldn't hang... + canSafelyCallIsDlgMsg = true; - break; + break; + } } + + if ( !canSafelyCallIsDlgMsg ) + return false; } - } #endif // !__WXWINCE__ - if ( canSafelyCallIsDlgMsg ) - { // ::IsDialogMessage() can enter in an infinite loop when the // currently focused window is disabled or hidden and its // parent has WS_EX_CONTROLPARENT style, so don't call it in @@ -2601,9 +2594,7 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg) !::IsWindowVisible(hwndFocus) ) { // it would enter an infinite loop if we do this! - canSafelyCallIsDlgMsg = false; - - break; + return false; } if ( !(::GetWindowLong(hwndFocus, GWL_STYLE) & WS_CHILD) ) @@ -2618,9 +2609,11 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg) } } - return canSafelyCallIsDlgMsg; + return ::IsDialogMessage(GetHwnd(), msg) != 0; } +#endif // __WXUNIVERSAL__ + // --------------------------------------------------------------------------- // message params unpackers // --------------------------------------------------------------------------- @@ -3491,6 +3484,29 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result, } } break; + +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + case WM_INITMENUPOPUP: + case WM_MENUSELECT: + case WM_EXITMENULOOP: + case WM_UNINITMENUPOPUP: + { + // Contrary to MSDN implications, at least some of these messages are + // not actually sent to the TLW for popup menus, but to the owning + // window or even its parent window. + // + // wx-3.1+ handles these messages in wxWindow instead, but binary + // compatibility requirements on wx-3.0 make it simpler to just forward + // the messages to the wxTLW. + wxWindow *tlw = wxGetTopLevelParent(this); + if (tlw && tlw != this) + { + rc.result = tlw->MSWWindowProc(message, wParam, lParam); + processed = rc.result == 0; + } + } + break; +#endif // !__WXMICROWIN__ #endif // wxUSE_MENUS #ifndef __WXWINCE__ diff --git a/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlg.cpp b/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlg.cpp index 191286f6..53f11e02 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlg.cpp +++ b/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlg.cpp @@ -16,7 +16,7 @@ #include "wx/modalhook.h" -#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX +#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX && wxUSE_COLOURDLG IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) diff --git a/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlgosx.mm b/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlgosx.mm index 946471ff..e66fa62e 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlgosx.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/carbon/colordlgosx.mm @@ -28,7 +28,7 @@ // ============================================================================ //Mac OSX 10.2+ only -#if USE_NATIVE_FONT_DIALOG_FOR_MACOSX +#if USE_NATIVE_FONT_DIALOG_FOR_MACOSX && wxUSE_COLOURDLG IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) diff --git a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/glcanvas.mm b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/glcanvas.mm index 9f73bfec..eea1be01 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/glcanvas.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/glcanvas.mm @@ -81,28 +81,47 @@ void WXGLDestroyPixelFormat( WXGLPixelFormat pixelFormat ) WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList) { NSOpenGLPixelFormatAttribute data[512]; - const NSOpenGLPixelFormatAttribute defaultAttribs[] = + + unsigned p = 0; + data[p++] = NSOpenGLPFAMinimumPolicy; // make _SIZE tags behave more like GLX + + // Test if we support hardware acceleration, we always want to use it if it + // is available and, apparently, in spite of the Apple docs explicitly + // saying the contrary: + // + // If present, this attribute indicates that only hardware-accelerated + // renderers are considered. If not present, accelerated renderers are + // still preferred. + // + // hardware acceleration is not always used without it, so we do need to + // specify it. But we shouldn't do it if acceleration is really not + // available. + const NSOpenGLPixelFormatAttribute + attrsAccel[] = { NSOpenGLPFAAccelerated, 0 }; + if ( WXGLPixelFormat testFormat = [[NSOpenGLPixelFormat alloc] + initWithAttributes: attrsAccel] ) { - NSOpenGLPFADoubleBuffer, - NSOpenGLPFAMinimumPolicy, - NSOpenGLPFAColorSize,(NSOpenGLPixelFormatAttribute)8, - NSOpenGLPFAAlphaSize,(NSOpenGLPixelFormatAttribute)0, - NSOpenGLPFADepthSize,(NSOpenGLPixelFormatAttribute)8, - NSOpenGLPFAAccelerated, // use hardware accelerated context - (NSOpenGLPixelFormatAttribute)nil - }; + // Hardware acceleration is available, use it. + data[p++] = NSOpenGLPFAAccelerated; + [testFormat release]; + } const NSOpenGLPixelFormatAttribute *attribs; if ( !attribList ) { - attribs = defaultAttribs; + // Default attributes + data[p++] = NSOpenGLPFADoubleBuffer; + data[p++] = NSOpenGLPFAColorSize; + data[p++] = (NSOpenGLPixelFormatAttribute)8; + data[p++] = NSOpenGLPFAAlphaSize; + data[p++] = (NSOpenGLPixelFormatAttribute)0; + data[p++] = NSOpenGLPFADepthSize; + data[p++] = (NSOpenGLPixelFormatAttribute)8; + data[p] = 0; + attribs = data; } else { - unsigned p = 0; - data[p++] = NSOpenGLPFAMinimumPolicy; // make _SIZE tags behave more like GLX - data[p++] = NSOpenGLPFAAccelerated; // use hardware accelerated context - for ( unsigned arg = 0; attribList[arg] !=0 && p < WXSIZEOF(data); ) { switch ( attribList[arg++] ) @@ -216,7 +235,7 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList) } } - data[p] = (NSOpenGLPixelFormatAttribute)nil; + data[p] = 0; attribs = data; } diff --git a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/taskbar.mm b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/taskbar.mm index 06342b4e..bee9636a 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/taskbar.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/taskbar.mm @@ -355,18 +355,32 @@ bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxStri m_icon.CopyFromIcon(icon); // status item doesn't scale automatically + // first scale to optimal pixel resolution - int dimension = m_icon.GetHeight(); - if ( m_icon.GetWidth() > dimension ) - dimension = m_icon.GetWidth(); - if ( dimension > 16 ) + int dimension = wxMax( m_icon.GetHeight(), m_icon.GetWidth() ); + int target_dimension = 16 * wxOSXGetMainScreenContentScaleFactor(); + if ( dimension > target_dimension ) { wxImage img = m_icon.ConvertToImage(); - int factor = (dimension+15)/16; + int factor = (dimension+(target_dimension-1))/target_dimension; m_icon = img.ShrinkBy(factor, factor); } - - [m_statusItem setImage:m_icon.GetNSImage()]; + + NSImage* nsimage = m_icon.GetNSImage(); + NSSize size = [nsimage size]; + + // then scale to optimal point resolution + + dimension = wxMax(size.width,size.height); + if ( dimension > 16 ) + { + int factor = (dimension+15)/16; + size.width /= factor; + size.height /= factor; + [nsimage setSize:size]; + } + [m_statusItem setImage:nsimage]; + wxCFStringRef cfTooltip(tooltip); [m_statusItem setToolTip:cfTooltip.AsNSString()]; return true; diff --git a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/toolbar.mm b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/toolbar.mm index 701f3f45..05787bf4 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/toolbar.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/toolbar.mm @@ -315,6 +315,16 @@ private: - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar; +@end + + +@interface wxNSToolbar : NSToolbar +{ + wxNSToolbarDelegate* toolbarDelegate; +} + +- (id)initWithIdentifier:(NSString *)identifier; +- (void) dealloc; @end @@ -423,6 +433,28 @@ private: @end + +@implementation wxNSToolbar + +- (id)initWithIdentifier:(NSString *)identifier +{ + self = [super initWithIdentifier:identifier]; + if (self) + { + toolbarDelegate = [[wxNSToolbarDelegate alloc] init]; + [self setDelegate:toolbarDelegate]; + } + return self; +} + +- (void)dealloc +{ + [toolbarDelegate release]; + [super dealloc]; +} + +@end + #endif @implementation wxNSToolBarButton @@ -537,9 +569,9 @@ void wxToolBarTool::UpdateImages() wxMemoryDC dc; dc.SelectObject( m_alternateBitmap ); - dc.SetPen( wxPen(*wxBLACK) ); - dc.SetBrush( wxBrush( *wxLIGHT_GREY )); - dc.DrawRoundedRectangle( 0, 0, w, h, 2 ); + dc.SetPen(*wxGREY_PEN); + dc.SetBrush(*wxGREY_BRUSH); + dc.DrawRoundedRectangle( 0, 0, w, h, 3 ); dc.DrawBitmap( m_bmpNormal, 0, 0, true ); dc.SelectObject( wxNullBitmap ); @@ -645,20 +677,14 @@ bool wxToolBar::Create( if (parent->IsKindOf(CLASSINFO(wxFrame)) && wxSystemOptions::GetOptionInt(wxT("mac.toolbar.no-native")) != 1) { - static wxNSToolbarDelegate* controller = nil; - - if ( controller == nil ) - controller = [[wxNSToolbarDelegate alloc] init]; wxString identifier = wxString::Format( wxT("%p"), this ); wxCFStringRef cfidentifier(identifier); - NSToolbar* tb = [[NSToolbar alloc] initWithIdentifier:cfidentifier.AsNSString()]; + NSToolbar* tb = [[wxNSToolbar alloc] initWithIdentifier:cfidentifier.AsNSString()]; m_macToolbar = tb ; if (m_macToolbar != NULL) { - [tb setDelegate:controller]; - NSToolbarDisplayMode mode = NSToolbarDisplayModeDefault; NSToolbarSizeMode displaySize = NSToolbarSizeModeSmall; diff --git a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/utils.mm b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/utils.mm index 4b4f003a..02843c83 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/utils.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/utils.mm @@ -369,7 +369,7 @@ bool wxApp::DoInitGui() } appcontroller = OSXCreateAppController(); - [NSApp setDelegate:appcontroller]; + [[NSApplication sharedApplication] setDelegate:(id wxOSX_10_6_AND_LATER())appcontroller]; [NSColor setIgnoresAlpha:NO]; // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads diff --git a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/window.mm b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/window.mm index f2eb1e81..ede8ebf7 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/cocoa/window.mm +++ b/software/scsi2sd-util/wxWidgets/src/osx/cocoa/window.mm @@ -559,6 +559,9 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve break; } + // Remember value of g_lastButton for later click count adjustment + UInt32 prevLastButton = g_lastButton; + // a control click is interpreted as a right click bool thisButtonIsFakeRight = false ; if ( button == 0 && (modifiers & NSControlKeyMask) ) @@ -567,10 +570,6 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve thisButtonIsFakeRight = true ; } - // otherwise we report double clicks by connecting a left click with a ctrl-left click - if ( clickCount > 1 && button != g_lastButton ) - clickCount = 1 ; - // we must make sure that our synthetic 'right' button corresponds in // mouse down, moved and mouse up, and does not deliver a right down and left up switch (eventType) @@ -591,6 +590,22 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve else if ( g_lastButton == 1 && g_lastButtonWasFakeRight ) button = g_lastButton ; + // Adjust click count when clicking with different buttons, + // otherwise we report double clicks by connecting a left click with a ctrl-left click + switch (eventType) + { + case NSLeftMouseDown : + case NSRightMouseDown : + case NSOtherMouseDown : + case NSLeftMouseUp : + case NSRightMouseUp : + case NSOtherMouseUp : + clickCount = [nsEvent clickCount]; + if ( clickCount > 1 && button != prevLastButton ) + clickCount = 1 ; + break; + } + // Adjust the chord mask to remove the primary button and add the // secondary button. It is possible that the secondary button is // already pressed, e.g. on a mouse connected to a laptop, but this @@ -611,7 +626,6 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve case NSLeftMouseDown : case NSRightMouseDown : case NSOtherMouseDown : - clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : @@ -634,7 +648,6 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve case NSLeftMouseUp : case NSRightMouseUp : case NSOtherMouseUp : - clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : diff --git a/software/scsi2sd-util/wxWidgets/src/osx/menu_osx.cpp b/software/scsi2sd-util/wxWidgets/src/osx/menu_osx.cpp index 0b4b1fc2..57f722c5 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/menu_osx.cpp +++ b/software/scsi2sd-util/wxWidgets/src/osx/menu_osx.cpp @@ -46,6 +46,8 @@ wxMenuImpl::~wxMenuImpl() // the (popup) menu title has this special menuid static const int idMenuTitle = -3; +wxScopedPtr gs_emptyMenuBar; + // ============================================================================ // implementation // ============================================================================ @@ -73,7 +75,18 @@ void wxMenu::Init() wxMenu::~wxMenu() { - delete m_peer; +#if wxOSX_USE_CARBON + // when destroying the empty menu bar from the static scoped ptr + // the peer destructor removes an association from an already deleted + // hashmap leading to crashes. The guard avoids this, accepting some leaks... + static bool finalmenubar = false; + + if ( this == gs_emptyMenuBar.get() ) + finalmenubar = true; + + if ( !finalmenubar ) +#endif + delete m_peer; } WXHMENU wxMenu::GetHMenu() const @@ -585,8 +598,6 @@ bool wxMenuBar::s_macAutoWindowMenu = true ; WXHMENU wxMenuBar::s_macWindowMenuHandle = NULL ; -wxScopedPtr gs_emptyMenuBar; - const int firstMenuPos = 1; // to account for the 0th application menu on mac static wxMenu *CreateAppleMenu() diff --git a/software/scsi2sd-util/wxWidgets/src/osx/window_osx.cpp b/software/scsi2sd-util/wxWidgets/src/osx/window_osx.cpp index 747de71f..89fa0cc1 100644 --- a/software/scsi2sd-util/wxWidgets/src/osx/window_osx.cpp +++ b/software/scsi2sd-util/wxWidgets/src/osx/window_osx.cpp @@ -1607,8 +1607,6 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right if ( IsTopLevel() ) return ; - bool hasFocus = GetPeer()->NeedsFocusRect() && HasFocus(); - // back to the surrounding frame rectangle int tx,ty,tw,th; @@ -1616,8 +1614,9 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right GetPeer()->GetPosition( tx, ty ); #if wxOSX_USE_COCOA_OR_CARBON - { + const bool hasFocus = GetPeer()->NeedsFocusRect() && HasFocus(); + CGRect cgrect = CGRectMake( tx-1 , ty-1 , tw+2 , th+2 ) ; diff --git a/software/scsi2sd-util/wxWidgets/src/propgrid/propgrid.cpp b/software/scsi2sd-util/wxWidgets/src/propgrid/propgrid.cpp index 7b77965d..925c2bf6 100644 --- a/software/scsi2sd-util/wxWidgets/src/propgrid/propgrid.cpp +++ b/software/scsi2sd-util/wxWidgets/src/propgrid/propgrid.cpp @@ -5675,12 +5675,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild ) { if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY ) { - if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) ) + if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoCollapse(p, true) ) wasHandled = true; } else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY ) { - if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) ) + if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoExpand(p, true) ) wasHandled = true; } } diff --git a/software/scsi2sd-util/wxWidgets/src/ribbon/bar.cpp b/software/scsi2sd-util/wxWidgets/src/ribbon/bar.cpp index 1bad16a1..989aca8b 100644 --- a/software/scsi2sd-util/wxWidgets/src/ribbon/bar.cpp +++ b/software/scsi2sd-util/wxWidgets/src/ribbon/bar.cpp @@ -142,6 +142,7 @@ bool wxRibbonBar::Realize() wxClientDC dcTemp(this); int sep = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE); size_t numtabs = m_pages.GetCount(); + bool firstVisible = true; size_t i; for(i = 0; i < numtabs; ++i) { @@ -165,8 +166,10 @@ bool wxRibbonBar::Realize() &info.small_must_have_separator_width, &info.minimum_width); - if(i == 0) + if ( firstVisible ) { + firstVisible = false; + m_tabs_total_width_ideal = info.ideal_width; m_tabs_total_width_minimum = info.minimum_width; } diff --git a/software/scsi2sd-util/wxWidgets/src/richtext/richtextbuffer.cpp b/software/scsi2sd-util/wxWidgets/src/richtext/richtextbuffer.cpp index 3156a943..eab5652e 100644 --- a/software/scsi2sd-util/wxWidgets/src/richtext/richtextbuffer.cpp +++ b/software/scsi2sd-util/wxWidgets/src/richtext/richtextbuffer.cpp @@ -1551,7 +1551,7 @@ bool wxRichTextCompositeObject::Defragment(wxRichTextDrawingContext& context, co wxRichTextObject* child = node->GetData(); if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range)) { - if (child->IsEmpty()) + if (child->IsEmpty() && !child->IsKindOf(CLASSINFO(wxRichTextCell))) { child->Dereference(); m_children.Erase(node); @@ -12169,11 +12169,26 @@ bool wxRichTextImage::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wx wxRichTextAttr attr(GetAttributes()); AdjustAttributes(attr, context); - DrawBoxAttributes(dc, GetBuffer(), attr, wxRect(rect.GetPosition(), GetCachedSize())); + wxPoint position = rect.GetPosition(); + + if (attr.GetTextBoxAttr().HasVerticalAlignment() && + (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP)) + { + int leftOverSpace = rect.height - GetCachedSize().y; + if (leftOverSpace > 0) + { + if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE) + position.y += (leftOverSpace/2); + else if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM) + position.y += leftOverSpace; + } + } + + DrawBoxAttributes(dc, GetBuffer(), attr, wxRect(position, GetCachedSize())); wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight()); wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect; - marginRect = rect; // outer rectangle, will calculate contentRect + marginRect = wxRect(position, GetCachedSize()); // outer rectangle, will calculate contentRect GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect); dc.DrawBitmap(m_imageCache, contentRect.x, contentRect.y, true); diff --git a/software/scsi2sd-util/wxWidgets/src/richtext/richtextctrl.cpp b/software/scsi2sd-util/wxWidgets/src/richtext/richtextctrl.cpp index 8938066e..8d3a420f 100644 --- a/software/scsi2sd-util/wxWidgets/src/richtext/richtextctrl.cpp +++ b/software/scsi2sd-util/wxWidgets/src/richtext/richtextctrl.cpp @@ -1140,7 +1140,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) case WXK_SHIFT: case WXK_ALT: case WXK_CONTROL: - case WXK_MENU: case WXK_PAUSE: case WXK_CAPITAL: case WXK_END: @@ -1201,6 +1200,12 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) { return; } + case WXK_MENU: + { + // Necessary for the context menu to work on wxGTK + event.Skip(); + return; + } default: { } @@ -1367,6 +1372,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) switch ( keycode ) { case WXK_ESCAPE: + case WXK_MENU: // Necessary for the context menu to work on wxGTK { event.Skip(); return; diff --git a/software/scsi2sd-util/wxWidgets/src/richtext/richtextxml.cpp b/software/scsi2sd-util/wxWidgets/src/richtext/richtextxml.cpp index a47b7169..560d25a4 100644 --- a/software/scsi2sd-util/wxWidgets/src/richtext/richtextxml.cpp +++ b/software/scsi2sd-util/wxWidgets/src/richtext/richtextxml.cpp @@ -427,6 +427,38 @@ bool wxRichTextPlainText::ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* nod { wxString text; wxXmlNode* textChild = node->GetChildren(); + + // First skip past properties, if any. + wxXmlNode* n = textChild; + while (n) + { + // Skip past properties + if ((n->GetType() == wxXML_ELEMENT_NODE) && n->GetName() == wxT("properties")) + { + textChild = n->GetNext(); + n = NULL; + + // Skip past the whitespace after the properties + while (textChild && (textChild->GetType() == wxXML_TEXT_NODE)) + { + wxString text = textChild->GetContent(); + text.Trim(true); + text.Trim(false); + if (!text.IsEmpty()) + { + textChild->SetContent(text); + break; + } + else + textChild = textChild->GetNext(); + } + + break; + } + if (n) + n = n->GetNext(); + } + while (textChild) { if (textChild->GetType() == wxXML_TEXT_NODE || diff --git a/software/scsi2sd-util/wxWidgets/src/unix/displayx11.cpp b/software/scsi2sd-util/wxWidgets/src/unix/displayx11.cpp index c8a96055..fdb3ae63 100644 --- a/software/scsi2sd-util/wxWidgets/src/unix/displayx11.cpp +++ b/software/scsi2sd-util/wxWidgets/src/unix/displayx11.cpp @@ -159,7 +159,58 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n) return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL; } -#endif // !__WXGTK20__ +#else // __WXGTK20__ + +// Provide stubs for the functions which were (wrongly!) part of ABI in 3.0.0. +// They should never be actually used by anybody, but still keep them present, +// just to be certain we don't prevent some programs referencing, but not +// using, them from running with later 3.0.x versions. +class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl +{ +public: + wxDisplayImplX11(unsigned n) : wxDisplayImpl(n) { } + + // These are inline because they were inline in 3.0.0 too. + virtual wxRect GetGeometry() const { return wxRect(); } + virtual wxRect GetClientArea() const { return wxRect(); } + virtual wxString GetName() const { return wxString(); } + + // And those were not. + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual wxVideoMode GetCurrentMode() const; + virtual bool ChangeMode(const wxVideoMode& mode); + +private: + // We must also have the same data fields as in 3.0.0, even if they are + // unused, to avoid ABI checker warnings. + wxRect m_rect; + int m_depth; +}; + +wxArrayVideoModes +wxDisplayImplX11::GetModes(const wxVideoMode& WXUNUSED(mode)) const +{ + return wxArrayVideoModes(); +} + +wxVideoMode wxDisplayImplX11::GetCurrentMode() const +{ + return wxVideoMode(); +} + +bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode)) +{ + return false; +} + +// We need to reference this class, otherwise our stubs will be simply +// discarded. Notice that this function just needs to exist, not be called. +extern wxDisplayImpl* wxDisplayImplX11Use(unsigned n) +{ + return new wxDisplayImplX11(n); +} + +#endif // !__WXGTK20__/__WXGTK20__ // ============================================================================ // wxDisplayImplX11 implementation diff --git a/software/scsi2sd-util/wxWidgets/src/unix/stackwalk.cpp b/software/scsi2sd-util/wxWidgets/src/unix/stackwalk.cpp index e8cf6edf..eccb910e 100644 --- a/software/scsi2sd-util/wxWidgets/src/unix/stackwalk.cpp +++ b/software/scsi2sd-util/wxWidgets/src/unix/stackwalk.cpp @@ -215,6 +215,8 @@ bool ReadLine(FILE* fp, unsigned long num, wxString* line) { if ( !fgets(g_buf, WXSIZEOF(g_buf), fp) ) { + wxUnusedVar(num); // could be unused if debug tracing is disabled + wxLogDebug(wxS("cannot read address information for stack frame #%lu"), num); return false; diff --git a/software/scsi2sd-util/wxWidgets/src/xrc/xh_simplebook.cpp b/software/scsi2sd-util/wxWidgets/src/xrc/xh_simplebook.cpp new file mode 100644 index 00000000..30c88ceb --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/src/xrc/xh_simplebook.cpp @@ -0,0 +1,101 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/xrc/xh_simplebook.cpp +// Purpose: XRC resource handler for wxSimplebook +// Author: Vaclav Slavik +// Created: 2014-08-05 +// Copyright: (c) 2014 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_XRC && wxUSE_BOOKCTRL + +#include "wx/xrc/xh_simplebook.h" + +#ifndef WX_PRECOMP +#endif + +#include "wx/simplebook.h" + +wxIMPLEMENT_DYNAMIC_CLASS(wxSimplebookXmlHandler, wxXmlResourceHandler); + +wxSimplebookXmlHandler::wxSimplebookXmlHandler() + : wxXmlResourceHandler(), + m_isInside(false), + m_simplebook(NULL) +{ + AddWindowStyles(); +} + +wxObject *wxSimplebookXmlHandler::DoCreateResource() +{ + if (m_class == wxS("simplebookpage")) + { + wxXmlNode *n = GetParamNode(wxS("object")); + + if ( !n ) + n = GetParamNode(wxS("object_ref")); + + if (n) + { + bool old_ins = m_isInside; + m_isInside = false; + wxObject *item = CreateResFromNode(n, m_simplebook, NULL); + m_isInside = old_ins; + wxWindow *wnd = wxDynamicCast(item, wxWindow); + + if (wnd) + { + m_simplebook->AddPage(wnd, GetText(wxS("label")), + GetBool(wxS("selected"))); + } + else + { + ReportError(n, "simplebookpage child must be a window"); + } + return wnd; + } + else + { + ReportError("simplebookpage must have a window child"); + return NULL; + } + } + + else + { + XRC_MAKE_INSTANCE(sb, wxSimplebook) + + sb->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(wxS("style")), + GetName()); + + SetupWindow(sb); + + wxSimplebook *old_par = m_simplebook; + m_simplebook = sb; + bool old_ins = m_isInside; + m_isInside = true; + CreateChildren(m_simplebook, true/*only this handler*/); + m_isInside = old_ins; + m_simplebook = old_par; + + return sb; + } +} + +bool wxSimplebookXmlHandler::CanHandle(wxXmlNode *node) +{ + return ((!m_isInside && IsOfClass(node, wxS("wxSimplebook"))) || + (m_isInside && IsOfClass(node, wxS("simplebookpage")))); +} + +#endif // wxUSE_XRC && wxUSE_BOOKCTRL diff --git a/software/scsi2sd-util/wxWidgets/src/xrc/xh_toolb.cpp b/software/scsi2sd-util/wxWidgets/src/xrc/xh_toolb.cpp index cef30a19..885a3577 100644 --- a/software/scsi2sd-util/wxWidgets/src/xrc/xh_toolb.cpp +++ b/software/scsi2sd-util/wxWidgets/src/xrc/xh_toolb.cpp @@ -138,7 +138,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() ); if ( GetBool(wxT("disabled")) ) - m_toolbar->EnableTool(GetID(), false); + m_toolbar->EnableTool(tool->GetId(), false); if ( GetBool(wxS("checked")) ) { @@ -152,7 +152,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() } else { - m_toolbar->ToggleTool(GetID(), true); + m_toolbar->ToggleTool(tool->GetId(), true); } } diff --git a/software/scsi2sd-util/wxWidgets/src/xrc/xmlres.cpp b/software/scsi2sd-util/wxWidgets/src/xrc/xmlres.cpp index 862eabdb..da11cc9f 100644 --- a/software/scsi2sd-util/wxWidgets/src/xrc/xmlres.cpp +++ b/software/scsi2sd-util/wxWidgets/src/xrc/xmlres.cpp @@ -2268,7 +2268,8 @@ wxFont wxXmlResourceHandlerImpl::GetFont(const wxString& param, wxWindow* parent if (hasFamily) { wxString family = GetParamValue(wxT("family")); - if (family == wxT("decorative")) ifamily = wxDECORATIVE; + if (family == wxT("default")) ifamily = wxFONTFAMILY_DEFAULT; + else if (family == wxT("decorative")) ifamily = wxDECORATIVE; else if (family == wxT("roman")) ifamily = wxROMAN; else if (family == wxT("script")) ifamily = wxSCRIPT; else if (family == wxT("swiss")) ifamily = wxSWISS; @@ -2401,6 +2402,31 @@ void wxXmlResourceHandlerImpl::SetupWindow(wxWindow *wnd) { //FIXME : add cursor + const wxString variant = GetParamValue(wxS("variant")); + if (!variant.empty()) + { + if (variant == wxS("normal")) + wnd->SetWindowVariant(wxWINDOW_VARIANT_NORMAL); + else if (variant == wxS("small")) + wnd->SetWindowVariant(wxWINDOW_VARIANT_SMALL); + else if (variant == wxS("mini")) + wnd->SetWindowVariant(wxWINDOW_VARIANT_MINI); + else if (variant == wxS("large")) + wnd->SetWindowVariant(wxWINDOW_VARIANT_LARGE); + else + { + ReportParamError + ( + wxS("variant"), + wxString::Format + ( + "Invalid window variant \"%s\": must be one of " + "normal|small|mini|large.", + variant + ) + ); + } + } if (HasParam(wxT("exstyle"))) // Have to OR it with existing style, since // some implementations (e.g. wxGTK) use the extra style diff --git a/software/scsi2sd-util/wxWidgets/src/xrc/xmlrsall.cpp b/software/scsi2sd-util/wxWidgets/src/xrc/xmlrsall.cpp index 2e301347..0f3bb077 100644 --- a/software/scsi2sd-util/wxWidgets/src/xrc/xmlrsall.cpp +++ b/software/scsi2sd-util/wxWidgets/src/xrc/xmlrsall.cpp @@ -151,6 +151,9 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_SEARCHCTRL AddHandler(new wxSearchCtrlXmlHandler); #endif +#if wxUSE_BOOKCTRL + AddHandler(new wxSimplebookXmlHandler); +#endif #if wxUSE_SLIDER AddHandler(new wxSliderXmlHandler); #endif diff --git a/software/scsi2sd-util/wxWidgets/tests/Makefile.in b/software/scsi2sd-util/wxWidgets/tests/Makefile.in index 99acb93a..b460be63 100644 --- a/software/scsi2sd-util/wxWidgets/tests/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/tests/Makefile.in @@ -46,7 +46,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -158,6 +158,7 @@ TEST_GUI_OBJECTS = \ test_gui_ellipsization.o \ test_gui_measuring.o \ test_gui_affinematrix.o \ + test_gui_boundingbox.o \ test_gui_config.o \ test_gui_bitmapcomboboxtest.o \ test_gui_bitmaptogglebuttontest.o \ @@ -738,6 +739,9 @@ test_gui_measuring.o: $(srcdir)/graphics/measuring.cpp $(TEST_GUI_ODEP) test_gui_affinematrix.o: $(srcdir)/graphics/affinematrix.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/affinematrix.cpp +test_gui_boundingbox.o: $(srcdir)/graphics/boundingbox.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/boundingbox.cpp + test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp diff --git a/software/scsi2sd-util/wxWidgets/tests/arrays/arrays.cpp b/software/scsi2sd-util/wxWidgets/tests/arrays/arrays.cpp index 0ac0ec19..6d42b6ba 100644 --- a/software/scsi2sd-util/wxWidgets/tests/arrays/arrays.cpp +++ b/software/scsi2sd-util/wxWidgets/tests/arrays/arrays.cpp @@ -348,6 +348,10 @@ void ArraysTestCase::wxStringArrayTest() a5.resize(3); CPPUNIT_ASSERT_EQUAL( 3, a5.size() ); CPPUNIT_ASSERT_EQUAL( "Foo", a5[2] ); + + wxArrayString a6; + a6.Add("Foo"); + a6.Insert(a6[0], 1, 100); } void ArraysTestCase::SortedArray() @@ -713,6 +717,7 @@ void ArraysTestCase::TestSTL() items.push_back(new Item(17)); CPPUNIT_ASSERT_EQUAL( 17, (*(items.rbegin()))->n ); CPPUNIT_ASSERT_EQUAL( 17, (**items.begin()).n ); + WX_CLEAR_ARRAY(items); } void ArraysTestCase::IndexFromEnd() diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/Makefile.in b/software/scsi2sd-util/wxWidgets/tests/benchmarks/Makefile.in index 4f9c1dd5..e356e07d 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/Makefile.in @@ -39,7 +39,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8.sln b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8.sln index 52cc8aeb..4ab26b0b 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8.sln +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8.sln @@ -7,27 +7,47 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.ActiveCfg = Debug|Win32 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|Win32.Build.0 = Debug|Win32 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.ActiveCfg = Debug|x64 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Debug|x64.Build.0 = Debug|x64 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.ActiveCfg = Release|Win32 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|Win32.Build.0 = Release|Win32 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.ActiveCfg = Release|x64 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.Release|x64.Build.0 = Release|x64 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}.DLL Release|x64.Build.0 = DLL Release|x64 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.ActiveCfg = Debug|Win32 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|Win32.Build.0 = Debug|Win32 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.ActiveCfg = Debug|x64 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Debug|x64.Build.0 = Debug|x64 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.ActiveCfg = Release|Win32 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|Win32.Build.0 = Release|Win32 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.ActiveCfg = Release|x64 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.Release|x64.Build.0 = Release|x64 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Debug|x64.Build.0 = DLL Debug|x64 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {4BBE5BC1-5EE7-5792-84D5-A2611CE91B42}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench.vcproj b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench.vcproj index af9a92a2..c3715171 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench_gui.vcproj b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench_gui.vcproj index d2ae5559..541c8efe 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench_gui.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc8_bench_gui.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9.sln b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9.sln index 0c8b3765..62af3302 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9.sln +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9.sln @@ -7,27 +7,47 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.ActiveCfg = Debug|Win32 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|Win32.Build.0 = Debug|Win32 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.ActiveCfg = Debug|x64 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Debug|x64.Build.0 = Debug|x64 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.ActiveCfg = Release|Win32 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|Win32.Build.0 = Release|Win32 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.ActiveCfg = Release|x64 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.Release|x64.Build.0 = Release|x64 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Debug|x64.Build.0 = DLL Debug|x64 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}.DLL Release|x64.Build.0 = DLL Release|x64 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.ActiveCfg = Debug|Win32 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|Win32.Build.0 = Debug|Win32 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.ActiveCfg = Debug|x64 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Debug|x64.Build.0 = Debug|x64 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.ActiveCfg = Release|Win32 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|Win32.Build.0 = Release|Win32 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.ActiveCfg = Release|x64 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.Release|x64.Build.0 = Release|x64 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Debug|x64.Build.0 = DLL Debug|x64 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {9B5F97AF-C174-572F-9134-D2E56F7810BE}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench.vcproj b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench.vcproj index 42c7d14a..065275f3 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench_gui.vcproj b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench_gui.vcproj index d8437e9a..eacda828 100644 --- a/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench_gui.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/benchmarks/bench_vc9_bench_gui.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/tests/controls/listbasetest.cpp b/software/scsi2sd-util/wxWidgets/tests/controls/listbasetest.cpp index 428840b3..47d349c1 100644 --- a/software/scsi2sd-util/wxWidgets/tests/controls/listbasetest.cpp +++ b/software/scsi2sd-util/wxWidgets/tests/controls/listbasetest.cpp @@ -445,7 +445,7 @@ namespace { //From the sample but fixed so it actually inverts int wxCALLBACK - MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData)) + MyCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData)) { // inverse the order if (item1 < item2) diff --git a/software/scsi2sd-util/wxWidgets/tests/datetime/datetimetest.cpp b/software/scsi2sd-util/wxWidgets/tests/datetime/datetimetest.cpp index 112e3291..2e57966e 100644 --- a/software/scsi2sd-util/wxWidgets/tests/datetime/datetimetest.cpp +++ b/software/scsi2sd-util/wxWidgets/tests/datetime/datetimetest.cpp @@ -228,6 +228,7 @@ private: CPPUNIT_TEST( TestDateParse ); CPPUNIT_TEST( TestDateParseISO ); CPPUNIT_TEST( TestDateTimeParse ); + CPPUNIT_TEST( TestDateWeekFormat ); CPPUNIT_TEST( TestTimeArithmetics ); CPPUNIT_TEST( TestDSTBug ); CPPUNIT_TEST( TestDateOnly ); @@ -247,6 +248,7 @@ private: void TestDateParse(); void TestDateParseISO(); void TestDateTimeParse(); + void TestDateWeekFormat(); void TestTimeArithmetics(); void TestDSTBug(); void TestDateOnly(); @@ -1212,6 +1214,85 @@ void DateTimeTestCase::TestDateTimeParse() } } +void DateTimeTestCase::TestDateWeekFormat() +{ + static const struct DateWeekTestData + { + int y, m, d; + const char* result; // expected output of "%G%V" + } testWeeks[] = + { + // Some manual test cases. + { 2014, 1, 1, "2014-01" }, + { 2014, 1, 2, "2014-01" }, + { 2014, 1, 3, "2014-01" }, + { 2014, 1, 4, "2014-01" }, + { 2014, 1, 5, "2014-01" }, + { 2014, 1, 6, "2014-02" }, + { 2014, 1, 7, "2014-02" }, + { 2014, 12, 24, "2014-52" }, + { 2014, 12, 25, "2014-52" }, + { 2014, 12, 26, "2014-52" }, + { 2014, 12, 27, "2014-52" }, + { 2014, 12, 28, "2014-52" }, + { 2014, 12, 29, "2015-01" }, + { 2014, 12, 30, "2015-01" }, + { 2014, 12, 31, "2015-01" }, + { 2015, 12, 24, "2015-52" }, + { 2015, 12, 25, "2015-52" }, + { 2015, 12, 26, "2015-52" }, + { 2015, 12, 27, "2015-52" }, + { 2015, 12, 28, "2015-53" }, + { 2015, 12, 29, "2015-53" }, + { 2015, 12, 30, "2015-53" }, + { 2015, 12, 31, "2015-53" }, + { 2016, 1, 1, "2015-53" }, + { 2016, 1, 2, "2015-53" }, + { 2016, 1, 3, "2015-53" }, + { 2016, 1, 4, "2016-01" }, + { 2016, 1, 5, "2016-01" }, + { 2016, 1, 6, "2016-01" }, + { 2016, 1, 7, "2016-01" }, + + // The rest of the tests was generated using the following zsh command: + // + // for n in {0..19}; date --date $((RANDOM%100 + 2000))-$((RANDOM%12+1))-$((RANDOM%31+1)) +'{ %Y, %_m, %_d, "%G-%V" },' + // + // (ignore invalid dates if any are randomly created). + { 2017, 11, 28, "2017-48" }, + { 2086, 9, 6, "2086-36" }, + { 2060, 11, 11, "2060-46" }, + { 2009, 5, 10, "2009-19" }, + { 2032, 12, 8, "2032-50" }, + { 2025, 4, 7, "2025-15" }, + { 2080, 5, 20, "2080-21" }, + { 2077, 7, 19, "2077-29" }, + { 2084, 12, 17, "2084-50" }, + { 2071, 4, 13, "2071-16" }, + { 2006, 1, 3, "2006-01" }, + { 2053, 8, 1, "2053-31" }, + { 2097, 8, 14, "2097-33" }, + { 2067, 1, 3, "2067-01" }, + { 2039, 9, 27, "2039-39" }, + { 2095, 2, 10, "2095-06" }, + { 2004, 7, 7, "2004-28" }, + { 2049, 12, 27, "2049-52" }, + { 2071, 8, 19, "2071-34" }, + { 2010, 11, 30, "2010-48" }, + }; + + for ( size_t n = 0; n < WXSIZEOF(testWeeks); n++ ) + { + const DateWeekTestData& td = testWeeks[n]; + wxDateTime d(td.d, wxDateTime::Month(td.m - 1), td.y); + + CPPUNIT_ASSERT_EQUAL( td.result, d.Format("%G-%V") ); + + if ( td.y > 2000 ) + CPPUNIT_ASSERT_EQUAL( td.result + 2, d.Format("%g-%V") ); + } +} + void DateTimeTestCase::TestTimeArithmetics() { static const wxDateSpan testArithmData[] = diff --git a/software/scsi2sd-util/wxWidgets/tests/filename/filenametest.cpp b/software/scsi2sd-util/wxWidgets/tests/filename/filenametest.cpp index f54e8e83..29bcfaf6 100644 --- a/software/scsi2sd-util/wxWidgets/tests/filename/filenametest.cpp +++ b/software/scsi2sd-util/wxWidgets/tests/filename/filenametest.cpp @@ -27,6 +27,9 @@ #ifdef __WINDOWS__ #include "wx/msw/registry.h" + #include + #include "wx/msw/ole/oleutils.h" + #include "wx/msw/private/comptr.h" #endif // __WINDOWS__ #ifdef __UNIX__ @@ -145,6 +148,9 @@ private: #if defined(__UNIX__) CPPUNIT_TEST( TestSymlinks ); #endif // __UNIX__ +#ifdef __WINDOWS__ + CPPUNIT_TEST( TestShortcuts ); +#endif // __WINDOWS__ CPPUNIT_TEST_SUITE_END(); void TestConstruction(); @@ -168,6 +174,9 @@ private: #if defined(__UNIX__) void TestSymlinks(); #endif // __UNIX__ +#ifdef __WINDOWS__ + void TestShortcuts(); +#endif // __WINDOWS__ DECLARE_NO_COPY_CLASS(FileNameTestCase) }; @@ -996,3 +1005,53 @@ void FileNameTestCase::TestSymlinks() } #endif // __UNIX__ + +#ifdef __WINDOWS__ + +namespace +{ + +void CreateShortcut(const wxString& pathFile, const wxString& pathLink) +{ + wxOleInitializer oleInit; + + HRESULT hr; + + wxCOMPtr sl; + hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + IID_IShellLink, (void **)&sl); + CPPUNIT_ASSERT( SUCCEEDED(hr) ); + + wxCOMPtr pf; + hr = sl->QueryInterface(IID_IPersistFile, (void **)&pf); + CPPUNIT_ASSERT( SUCCEEDED(hr) ); + + hr = sl->SetPath(pathFile.wx_str()); + CPPUNIT_ASSERT( SUCCEEDED(hr) ); + + hr = pf->Save(pathLink.wx_str(), TRUE); + CPPUNIT_ASSERT( SUCCEEDED(hr) ); +} + +} // anonymous namespace + +void FileNameTestCase::TestShortcuts() +{ + wxFileName fn(wxFileName::CreateTempFileName("filenametest")); + CPPUNIT_ASSERT( fn.IsOk() ); + wxON_BLOCK_EXIT1( wxRemoveFile, fn.GetFullPath() ); + + wxFileName fnLink(fn.GetPath(), "sc_" + fn.GetName(), "lnk"); + CPPUNIT_ASSERT( fnLink.IsOk() ); + wxON_BLOCK_EXIT1( wxRemoveFile, fnLink.GetFullPath() ); + + CreateShortcut(fn.GetFullPath(), fnLink.GetFullPath()); + + // MakeRelativeTo() is supposed to change only the path of the file, not its + // name. + wxFileName fnLinkRel(fnLink); + fnLink.MakeRelativeTo("."); + CPPUNIT_ASSERT_EQUAL(fnLink.GetFullName(), fnLinkRel.GetFullName()); +} + +#endif // __WINDOWS__ diff --git a/software/scsi2sd-util/wxWidgets/tests/graphics/boundingbox.cpp b/software/scsi2sd-util/wxWidgets/tests/graphics/boundingbox.cpp new file mode 100644 index 00000000..43e58e9d --- /dev/null +++ b/software/scsi2sd-util/wxWidgets/tests/graphics/boundingbox.cpp @@ -0,0 +1,335 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/graphics/boundingbox.cpp +// Purpose: wxGCDC bounding box unit tests +// Author: Vadim Zeitlin / Maarten Spoek / Toni Ruža +// Created: 2011-01-36 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// (c) 2014 Toni Ruža +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/bitmap.h" +#include "wx/dcmemory.h" +#include "wx/dcgraph.h" +#include "wx/icon.h" +#include "wx/colour.h" +#include "wx/gdicmn.h" + + +// ---------------------------------------------------------------------------- +// test class +// ---------------------------------------------------------------------------- + +class GCDCBoundingBoxTestCase : public CppUnit::TestCase +{ +public: + GCDCBoundingBoxTestCase() + { + m_bmp.Create(100, 100); + m_dc.SelectObject(m_bmp); + m_gcdc = new wxGCDC(m_dc); + } + + ~GCDCBoundingBoxTestCase() + { + delete m_gcdc; + m_dc.SelectObject(wxNullBitmap); + m_bmp = wxNullBitmap; + } + + virtual void setUp() + { + m_gcdc->ResetBoundingBox(); + } + +private: + wxBitmap m_bmp; + wxMemoryDC m_dc; + wxGCDC *m_gcdc; + + void AssertBox(int minX, int minY, int width, int height, int margin = 0) + { + int maxX = minX + width; + int maxY = minY + height; + + // Allow for a margin of error due to different implementation + // specificities regarding drawing paths. + if ( margin ) + { + #define WX_ASSERT_CLOSE(expected, actual, delta) \ + WX_ASSERT_MESSAGE(("%d != %d", actual, expected), \ + abs(actual - expected) <= delta) + + WX_ASSERT_CLOSE(minX, m_gcdc->MinX(), margin); + WX_ASSERT_CLOSE(minY, m_gcdc->MinY(), margin); + WX_ASSERT_CLOSE(maxX, m_gcdc->MaxX(), margin); + WX_ASSERT_CLOSE(maxY, m_gcdc->MaxY(), margin); + + #undef WX_ASSERT_CLOSE + } + else + { + CPPUNIT_ASSERT_EQUAL(minX, m_gcdc->MinX()); + CPPUNIT_ASSERT_EQUAL(minY, m_gcdc->MinY()); + CPPUNIT_ASSERT_EQUAL(maxX, m_gcdc->MaxX()); + CPPUNIT_ASSERT_EQUAL(maxY, m_gcdc->MaxY()); + } + } + + CPPUNIT_TEST_SUITE( GCDCBoundingBoxTestCase ); + CPPUNIT_TEST( DrawBitmap ); + CPPUNIT_TEST( DrawIcon ); + CPPUNIT_TEST( DrawLine ); + CPPUNIT_TEST( CrossHair ); + CPPUNIT_TEST( DrawArc ); + CPPUNIT_TEST( DrawEllipticArc ); + CPPUNIT_TEST( DrawPoint ); + CPPUNIT_TEST( DrawLines ); + #if wxUSE_SPLINES + CPPUNIT_TEST( DrawSpline ); + #endif + CPPUNIT_TEST( DrawPolygon ); + CPPUNIT_TEST( DrawPolyPolygon ); + CPPUNIT_TEST( DrawRectangle ); + CPPUNIT_TEST( DrawRoundedRectangle ); + CPPUNIT_TEST( DrawEllipse ); + CPPUNIT_TEST( Blit ); + CPPUNIT_TEST( StretchBlit ); + CPPUNIT_TEST( DrawRotatedText ); + CPPUNIT_TEST( DrawText ); + CPPUNIT_TEST( GradientFillLinear ); + CPPUNIT_TEST( GradientFillConcentric ); + CPPUNIT_TEST( DrawCheckMark ); + CPPUNIT_TEST_SUITE_END(); + + void DrawBitmap(); + void DrawIcon(); + void DrawLine(); + void CrossHair(); + void DrawArc(); + void DrawEllipticArc(); + void DrawPoint(); + void DrawLines(); + #if wxUSE_SPLINES + void DrawSpline(); + #endif + void DrawPolygon(); + void DrawPolyPolygon(); + void DrawRectangle(); + void DrawRoundedRectangle(); + void DrawEllipse(); + void Blit(); + void StretchBlit(); + void DrawRotatedText(); + void DrawText(); + void GradientFillLinear(); + void GradientFillConcentric(); + void DrawCheckMark(); + + DECLARE_NO_COPY_CLASS(GCDCBoundingBoxTestCase) +}; + +// register in the unnamed registry so that these tests are run by default +CPPUNIT_TEST_SUITE_REGISTRATION( GCDCBoundingBoxTestCase ); + +// also include in it's own registry so that these tests can be run alone +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GCDCBoundingBoxTestCase, "GCDCBoundingBoxTestCase" ); + + +void GCDCBoundingBoxTestCase::DrawBitmap() +{ + wxBitmap bitmap; + bitmap.Create(12, 12); + + m_gcdc->DrawBitmap(bitmap, 5, 5); + AssertBox(5, 5, 12, 12); +} + +void GCDCBoundingBoxTestCase::DrawIcon() +{ + wxBitmap bitmap; + bitmap.Create(16, 16); + wxIcon icon; + icon.CopyFromBitmap(bitmap); + + m_gcdc->DrawIcon(icon, 42, 42); + AssertBox(42, 42, 16, 16); +} + +void GCDCBoundingBoxTestCase::DrawLine() +{ + m_gcdc->DrawLine(10, 10, 20, 15); + AssertBox(10, 10, 10, 5); +} + +void GCDCBoundingBoxTestCase::CrossHair() +{ + int w, h; + m_gcdc->GetSize(&w, &h); + + m_gcdc->CrossHair(33, 33); + AssertBox(0, 0, w, h); +} + +void GCDCBoundingBoxTestCase::DrawArc() +{ + m_gcdc->DrawArc(25, 30, 15, 40, 25, 40); // quarter circle + AssertBox(15, 30, 10, 10, 3); +} + +void GCDCBoundingBoxTestCase::DrawEllipticArc() +{ + m_gcdc->DrawEllipticArc(40, 50, 30, 20, 0, 180); // half circle + AssertBox(40, 50, 30, 10, 3); +} + +void GCDCBoundingBoxTestCase::DrawPoint() +{ + m_gcdc->DrawPoint(20, 20); + AssertBox(20, 20, 1, 1); +} + +void GCDCBoundingBoxTestCase::DrawLines() +{ + wxPoint points[4]; + points[0] = wxPoint(10, 20); + points[1] = wxPoint(20, 10); + points[2] = wxPoint(30, 20); + points[3] = wxPoint(20, 30); + + m_gcdc->DrawLines(4, points, 7, 8); + AssertBox(17, 18, 20, 20); +} + +#if wxUSE_SPLINES +void GCDCBoundingBoxTestCase::DrawSpline() +{ + wxPoint points[3]; + points[0] = wxPoint(10, 30); + points[1] = wxPoint(20, 20); + points[2] = wxPoint(40, 50); + + m_gcdc->DrawSpline(3, points); + AssertBox(10, 20, 30, 30, 5); +} +#endif // wxUSE_SPLINES + +void GCDCBoundingBoxTestCase::DrawPolygon() +{ + wxPoint points[3]; + points[0] = wxPoint(10, 30); + points[1] = wxPoint(20, 10); + points[2] = wxPoint(30, 30); + + m_gcdc->DrawPolygon(3, points, -5, -7); + AssertBox(5, 3, 20, 20); +} + +void GCDCBoundingBoxTestCase::DrawPolyPolygon() +{ + int lenghts[2]; + lenghts[0] = 3; + lenghts[1] = 3; + wxPoint points[6]; + points[0] = wxPoint(10, 30); + points[1] = wxPoint(20, 10); + points[2] = wxPoint(30, 30); + points[3] = wxPoint(20, 60); + points[4] = wxPoint(30, 40); + points[5] = wxPoint(40, 60); + + m_gcdc->DrawPolyPolygon(2, lenghts, points, 12, 5); + AssertBox(22, 15, 30, 50, 4); +} + +void GCDCBoundingBoxTestCase::DrawRectangle() +{ + m_gcdc->DrawRectangle(2, 2, 12, 12); + AssertBox(2, 2, 12, 12); +} + +void GCDCBoundingBoxTestCase::DrawRoundedRectangle() +{ + m_gcdc->DrawRoundedRectangle(27, 27, 12, 12, 2); + AssertBox(27, 27, 12, 12); +} + +void GCDCBoundingBoxTestCase::DrawEllipse() +{ + m_gcdc->DrawEllipse(54, 45, 23, 12); + AssertBox(54, 45, 23, 12); +} + +void GCDCBoundingBoxTestCase::Blit() +{ + wxBitmap bitmap; + bitmap.Create(20, 20); + wxMemoryDC dc(bitmap); + + m_gcdc->Blit(20, 10, 12, 7, &dc, 0, 0); + AssertBox(20, 10, 12, 7); + + dc.SelectObject(wxNullBitmap); +} + +void GCDCBoundingBoxTestCase::StretchBlit() +{ + wxBitmap bitmap; + bitmap.Create(20, 20); + wxMemoryDC dc(bitmap); + + m_gcdc->StretchBlit(30, 50, 5, 5, &dc, 0, 0, 12, 4); + AssertBox(30, 50, 5, 5); + + dc.SelectObject(wxNullBitmap); +} + +void GCDCBoundingBoxTestCase::DrawRotatedText() +{ + wxString text("vertical"); + wxCoord w, h; + m_gcdc->GetTextExtent(text, &w, &h); + + m_gcdc->DrawRotatedText(text, 43, 22, -90); + AssertBox(43 - h, 22, h, w, 3); +} + +void GCDCBoundingBoxTestCase::DrawText() +{ + wxString text("H"); + wxCoord w, h; + m_gcdc->GetTextExtent(text, &w, &h); + + m_gcdc->DrawText(text, 3, 3); + AssertBox(3, 3, w, h, 3); +} + +void GCDCBoundingBoxTestCase::GradientFillLinear() +{ + wxRect rect(16, 16, 30, 40); + m_gcdc->GradientFillLinear(rect, *wxWHITE, *wxBLACK, wxNORTH); + AssertBox(16, 16, 30, 40); +} + +void GCDCBoundingBoxTestCase::GradientFillConcentric() +{ + wxRect rect(6, 6, 30, 40); + m_gcdc->GradientFillConcentric(rect, *wxWHITE, *wxBLACK, wxPoint(10, 10)); + AssertBox(6, 6, 30, 40); +} + +void GCDCBoundingBoxTestCase::DrawCheckMark() +{ + m_gcdc->DrawCheckMark(32, 24, 16, 16); + AssertBox(32, 24, 16, 16); +} diff --git a/software/scsi2sd-util/wxWidgets/tests/makefile.bcc b/software/scsi2sd-util/wxWidgets/tests/makefile.bcc index 9808617b..5be298f2 100644 --- a/software/scsi2sd-util/wxWidgets/tests/makefile.bcc +++ b/software/scsi2sd-util/wxWidgets/tests/makefile.bcc @@ -144,6 +144,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_ellipsization.obj \ $(OBJS)\test_gui_measuring.obj \ $(OBJS)\test_gui_affinematrix.obj \ + $(OBJS)\test_gui_boundingbox.obj \ $(OBJS)\test_gui_config.obj \ $(OBJS)\test_gui_bitmapcomboboxtest.obj \ $(OBJS)\test_gui_bitmaptogglebuttontest.obj \ @@ -782,6 +783,9 @@ $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp $(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp +$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp + $(OBJS)\test_gui_config.obj: .\config\config.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp diff --git a/software/scsi2sd-util/wxWidgets/tests/makefile.gcc b/software/scsi2sd-util/wxWidgets/tests/makefile.gcc index f0917850..72963b56 100644 --- a/software/scsi2sd-util/wxWidgets/tests/makefile.gcc +++ b/software/scsi2sd-util/wxWidgets/tests/makefile.gcc @@ -137,6 +137,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_ellipsization.o \ $(OBJS)\test_gui_measuring.o \ $(OBJS)\test_gui_affinematrix.o \ + $(OBJS)\test_gui_boundingbox.o \ $(OBJS)\test_gui_config.o \ $(OBJS)\test_gui_bitmapcomboboxtest.o \ $(OBJS)\test_gui_bitmaptogglebuttontest.o \ @@ -767,6 +768,9 @@ $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp $(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_boundingbox.o: ./graphics/boundingbox.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_config.o: ./config/config.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --git a/software/scsi2sd-util/wxWidgets/tests/makefile.vc b/software/scsi2sd-util/wxWidgets/tests/makefile.vc index ac6d5ff4..2b053e64 100644 --- a/software/scsi2sd-util/wxWidgets/tests/makefile.vc +++ b/software/scsi2sd-util/wxWidgets/tests/makefile.vc @@ -141,6 +141,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_ellipsization.obj \ $(OBJS)\test_gui_measuring.obj \ $(OBJS)\test_gui_affinematrix.obj \ + $(OBJS)\test_gui_boundingbox.obj \ $(OBJS)\test_gui_config.obj \ $(OBJS)\test_gui_bitmapcomboboxtest.obj \ $(OBJS)\test_gui_bitmaptogglebuttontest.obj \ @@ -922,6 +923,9 @@ $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp $(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp +$(OBJS)\test_gui_boundingbox.obj: .\graphics\boundingbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\boundingbox.cpp + $(OBJS)\test_gui_config.obj: .\config\config.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp diff --git a/software/scsi2sd-util/wxWidgets/tests/strings/unicode.cpp b/software/scsi2sd-util/wxWidgets/tests/strings/unicode.cpp index d6e28164..ada16053 100644 --- a/software/scsi2sd-util/wxWidgets/tests/strings/unicode.cpp +++ b/software/scsi2sd-util/wxWidgets/tests/strings/unicode.cpp @@ -392,7 +392,7 @@ void UnicodeTestCase::ConversionUTF16() // Another one: verify that the length of the resulting string is computed // correctly when there is a surrogate in the input. - wxMBConvUTF16BE().cMB2WC("\xd8\x03\xdc\x01" /* OLD TURKIC LETTER YENISEI A */, wxNO_LEN, &len); + wxMBConvUTF16BE().cMB2WC("\xd8\x03\xdc\x01\0" /* OLD TURKIC LETTER YENISEI A */, wxNO_LEN, &len); CPPUNIT_ASSERT_EQUAL( 1, len ); } diff --git a/software/scsi2sd-util/wxWidgets/tests/test.bkl b/software/scsi2sd-util/wxWidgets/tests/test.bkl index 48309279..fa93e2f2 100644 --- a/software/scsi2sd-util/wxWidgets/tests/test.bkl +++ b/software/scsi2sd-util/wxWidgets/tests/test.bkl @@ -138,6 +138,7 @@ graphics/ellipsization.cpp graphics/measuring.cpp graphics/affinematrix.cpp + graphics/boundingbox.cpp config/config.cpp controls/bitmapcomboboxtest.cpp controls/bitmaptogglebuttontest.cpp diff --git a/software/scsi2sd-util/wxWidgets/tests/test_vc7_test_gui.vcproj b/software/scsi2sd-util/wxWidgets/tests/test_vc7_test_gui.vcproj index 8cc6d64e..d6c10c94 100644 --- a/software/scsi2sd-util/wxWidgets/tests/test_vc7_test_gui.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/test_vc7_test_gui.vcproj @@ -316,6 +316,9 @@ + + diff --git a/software/scsi2sd-util/wxWidgets/tests/test_vc8_test.vcproj b/software/scsi2sd-util/wxWidgets/tests/test_vc8_test.vcproj index 208c3f3f..a63f34ba 100644 --- a/software/scsi2sd-util/wxWidgets/tests/test_vc8_test.vcproj +++ b/software/scsi2sd-util/wxWidgets/tests/test_vc8_test.vcproj @@ -16,6 +16,9 @@ + @@ -419,6 +422,404 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -512,6 +913,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + @@ -419,6 +422,404 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -457,6 +858,10 @@ RelativePath=".\controls\bookctrlbasetest.cpp" > + + @@ -548,6 +953,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + @@ -405,6 +408,390 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -498,6 +885,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + @@ -405,6 +408,390 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -443,6 +830,10 @@ RelativePath=".\controls\bookctrlbasetest.cpp" > + + @@ -534,6 +925,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/emulator/src/emulator_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/emulator/src/emulator_vc9.vcproj index 8b70e971..2337321d 100644 --- a/software/scsi2sd-util/wxWidgets/utils/emulator/src/emulator_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/emulator/src/emulator_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.sln b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.sln index 00d2050f..f0ca1183 100644 --- a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.sln +++ b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.ActiveCfg = Debug|Win32 {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|Win32.Build.0 = Debug|Win32 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.ActiveCfg = Debug|x64 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.Debug|x64.Build.0 = Debug|x64 {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.ActiveCfg = Release|Win32 {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|Win32.Build.0 = Release|Win32 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.ActiveCfg = Release|x64 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.Release|x64.Build.0 = Release|x64 {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Debug|x64.Build.0 = DLL Debug|x64 {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {77853792-0C62-5E96-A5B5-BA0F518B7572}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.vcproj index 03ea6051..3deb3021 100644 --- a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.sln b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.sln index eb64d3e3..3f0d647c 100644 --- a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.sln +++ b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.ActiveCfg = Debug|Win32 {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|Win32.Build.0 = Debug|Win32 + {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.ActiveCfg = Debug|x64 + {8AF5279F-6710-5392-A32E-993D957C55F8}.Debug|x64.Build.0 = Debug|x64 {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.ActiveCfg = Release|Win32 {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|Win32.Build.0 = Release|Win32 + {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.ActiveCfg = Release|x64 + {8AF5279F-6710-5392-A32E-993D957C55F8}.Release|x64.Build.0 = Release|x64 {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8AF5279F-6710-5392-A32E-993D957C55F8}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.vcproj index 58df2f51..5dfc81ca 100644 --- a/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/execmon/execmon_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/helpview/src/Makefile.in b/software/scsi2sd-util/wxWidgets/utils/helpview/src/Makefile.in index 93dfdc60..c6618421 100644 --- a/software/scsi2sd-util/wxWidgets/utils/helpview/src/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/utils/helpview/src/Makefile.in @@ -46,7 +46,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc8.vcproj index 7d4daa51..215c4436 100644 --- a/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc9.vcproj index 2ef2e0e3..12a78192 100644 --- a/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/helpview/src/helpview_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc8.vcproj index f84761bb..c0ca2013 100644 --- a/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc9.vcproj index 25050628..d88af07d 100644 --- a/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/hhp2cached/hhp2cached_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.sln b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.sln index 2282c757..a9891b82 100644 --- a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.sln +++ b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.ActiveCfg = Debug|Win32 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|Win32.Build.0 = Debug|Win32 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.ActiveCfg = Debug|x64 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Debug|x64.Build.0 = Debug|x64 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.ActiveCfg = Release|Win32 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|Win32.Build.0 = Release|Win32 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.ActiveCfg = Release|x64 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.Release|x64.Build.0 = Release|x64 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Debug|x64.Build.0 = DLL Debug|x64 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {82C85703-712C-59F7-9E08-9F8EDE5D9DDF}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.vcproj index 3be7d778..cf11c9e4 100644 --- a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.sln b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.sln index ca65f570..4c83dfdc 100644 --- a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.sln +++ b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.ActiveCfg = Debug|Win32 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|Win32.Build.0 = Debug|Win32 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.ActiveCfg = Debug|x64 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Debug|x64.Build.0 = Debug|x64 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.ActiveCfg = Release|Win32 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|Win32.Build.0 = Release|Win32 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.ActiveCfg = Release|x64 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.Release|x64.Build.0 = Release|x64 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Debug|x64.Build.0 = DLL Debug|x64 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.vcproj index e1168bb8..665e62b8 100644 --- a/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/ifacecheck/src/ifacecheck_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/Makefile.in b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/Makefile.in index 43e59903..b464ee06 100644 --- a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/Makefile.in +++ b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/Makefile.in @@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.0 -WX_VERSION = $(WX_RELEASE).1 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SCREENSHOTGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.sln b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.sln index d1c03bf5..cffabc4a 100644 --- a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.sln +++ b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.ActiveCfg = Debug|Win32 {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|Win32.Build.0 = Debug|Win32 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.ActiveCfg = Debug|x64 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.Debug|x64.Build.0 = Debug|x64 {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.ActiveCfg = Release|Win32 {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|Win32.Build.0 = Release|Win32 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.ActiveCfg = Release|x64 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.Release|x64.Build.0 = Release|x64 {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Debug|x64.Build.0 = DLL Debug|x64 {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {D36F115C-330D-5EAE-B66F-885D6BE20540}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.vcproj index 3b5a6717..6def0a43 100644 --- a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.sln b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.sln index 709e1222..7ccd9d45 100644 --- a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.sln +++ b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.sln @@ -5,19 +5,31 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.ActiveCfg = Debug|Win32 {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|Win32.Build.0 = Debug|Win32 + {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.ActiveCfg = Debug|x64 + {820F5E3E-095B-580D-AE31-7E492C647B90}.Debug|x64.Build.0 = Debug|x64 {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.ActiveCfg = Release|Win32 {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|Win32.Build.0 = Release|Win32 + {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.ActiveCfg = Release|x64 + {820F5E3E-095B-580D-AE31-7E492C647B90}.Release|x64.Build.0 = Release|x64 {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Debug|x64.Build.0 = DLL Debug|x64 {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {820F5E3E-095B-580D-AE31-7E492C647B90}.DLL Release|x64.Build.0 = DLL Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.vcproj index 9f53a6ea..979ae77d 100644 --- a/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/screenshotgen/src/screenshotgen_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc.cpp b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc.cpp index fc522790..3f7a7a13 100644 --- a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc.cpp +++ b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc.cpp @@ -495,6 +495,10 @@ static bool NodeContainsFilename(wxXmlNode *node) return true; } + // wxAnimationCtrl animations: + if ( name == wxS("animation") ) + return true; + // URLs in wxHtmlWindow: if ( name == wxT("url") && parent != NULL && diff --git a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc8.vcproj b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc8.vcproj index b6cbf552..5d0ab63b 100644 --- a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc8.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc8.vcproj @@ -16,6 +16,9 @@ + @@ -407,6 +410,392 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc9.vcproj b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc9.vcproj index c1065858..d57d28bf 100644 --- a/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc9.vcproj +++ b/software/scsi2sd-util/wxWidgets/utils/wxrc/wxrc_vc9.vcproj @@ -16,6 +16,9 @@ + @@ -393,6 +396,378 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/scsi2sd-util/wxWidgets/version-script.in b/software/scsi2sd-util/wxWidgets/version-script.in index 858bed28..0c3503cf 100644 --- a/software/scsi2sd-util/wxWidgets/version-script.in +++ b/software/scsi2sd-util/wxWidgets/version-script.in @@ -21,6 +21,12 @@ # and once released its version cannot be changed. +# public symbols added in 3.0.2 (please keep in alphabetical order): +@WX_VERSION_TAG@.2 { + *wxGenericListCtrl*EndEditLabel*; +}; + + # public symbols added in 3.0.1 (please keep in alphabetical order): @WX_VERSION_TAG@.1 { *wxDataViewListCtrl*ClearColumns*;