Add DB25 adapter hardware design, plus other minor fixes

This commit is contained in:
Michael McMaster 2015-09-23 20:23:45 +10:00
parent 6d5c68d676
commit ceb8d24303
27 changed files with 2595 additions and 826 deletions

View File

@ -1,3 +1,7 @@
20150x0x 4.5
- Fix bug in SCSI MODE SENSE that returned the wrong mode type
- Fixes CDROM emulation
20150813 4.4
- Added configuration option to allow SCSI2 mode. This option is OFF by
default, and should only be enabled when using the SCSI2SD with a SCSI2 host

1288
hardware/db25-adapter.pcb Normal file

File diff suppressed because it is too large Load Diff

462
hardware/db25-adapter.sch Normal file
View File

@ -0,0 +1,462 @@
v 20130925 2
U 34000 50000 29500 50000 10 0
N 26700 44700 29300 44700 4
{
T 27200 44700 5 10 1 1 0 0 1
netname=\_DB0\_
}
N 21400 44100 25200 44100 4
{
T 23100 44100 5 10 1 1 0 0 1
netname=\_DB2\_
}
N 26700 43900 29300 43900 4
{
T 27200 43900 5 10 1 1 0 0 1
netname=\_DB3\_
}
N 21400 43700 25200 43700 4
{
T 23100 43700 5 10 1 1 0 0 1
netname=\_DB4\_
}
N 26700 43500 29300 43500 4
{
T 27200 43500 5 10 1 1 0 0 1
netname=\_DB5\_
}
N 26700 43200 29300 43200 4
{
T 27200 43200 5 10 1 1 0 0 1
netname=\_DB6\_
}
N 26700 42700 29300 42700 4
{
T 27200 42700 5 10 1 1 0 0 1
netname=\_DB7\_
}
N 21400 44900 25200 44900 4
{
T 23100 44900 5 10 1 1 0 0 1
netname=\_DBP\_
}
N 26700 45500 29300 45500 4
{
T 27200 45500 5 10 1 1 0 0 1
netname=\_BSY\_
}
N 26700 45900 29300 45900 4
{
T 27200 45900 5 10 1 1 0 0 1
netname=\_ACK\_
}
N 26700 46300 29300 46300 4
{
T 27200 46300 5 10 1 1 0 0 1
netname=\_RST\_
}
N 26700 47100 29300 47100 4
{
T 27200 47100 5 10 1 1 0 0 1
netname=\_MSG\_
}
N 21400 45300 25200 45300 4
{
T 23100 45300 5 10 1 1 0 0 1
netname=\_SEL\_
}
N 21400 46900 25200 46900 4
{
T 23100 46900 5 10 1 1 0 0 1
netname=\_C/D\_
}
N 26700 47500 29300 47500 4
{
T 27200 47500 5 10 1 1 0 0 1
netname=\_REQ\_
}
N 26700 46700 29300 46700 4
{
T 27200 46700 5 10 1 1 0 0 1
netname=\_I/O\_
}
N 21400 46100 25200 46100 4
{
T 23100 46100 5 10 1 1 0 0 1
netname=\_ATN\_
}
U 29500 50000 29500 39400 10 1
C 29300 44700 1 0 0 busripper-1.sym
{
T 29300 45100 5 8 0 0 0 0 1
device=none
}
C 29300 43900 1 270 0 busripper-1.sym
{
T 29700 43900 5 8 0 0 270 0 1
device=none
}
C 29300 43500 1 270 0 busripper-1.sym
{
T 29700 43500 5 8 0 0 270 0 1
device=none
}
C 29300 43200 1 270 0 busripper-1.sym
{
T 29700 43200 5 8 0 0 270 0 1
device=none
}
C 29300 42700 1 270 0 busripper-1.sym
{
T 29700 42700 5 8 0 0 270 0 1
device=none
}
C 29300 47500 1 270 0 busripper-1.sym
{
T 29700 47500 5 8 0 0 270 0 1
device=none
}
C 29300 45500 1 270 0 busripper-1.sym
{
T 29700 45500 5 8 0 0 270 0 1
device=none
}
C 29300 45900 1 270 0 busripper-1.sym
{
T 29700 45900 5 8 0 0 270 0 1
device=none
}
C 29300 46300 1 270 0 busripper-1.sym
{
T 29700 46300 5 8 0 0 270 0 1
device=none
}
C 29300 47100 1 270 0 busripper-1.sym
{
T 29700 47100 5 8 0 0 270 0 1
device=none
}
C 29300 46700 1 270 0 busripper-1.sym
{
T 29700 46700 5 8 0 0 270 0 1
device=none
}
N 21400 44500 25200 44500 4
{
T 23100 44500 5 10 1 1 0 0 1
netname=\_DB1\_
}
C 25200 42300 1 0 0 DB25-2.sym
{
T 26600 47650 5 10 0 0 0 0 1
device=DB25
T 25600 48000 5 10 1 1 0 0 1
refdes=J2
T 25200 42300 5 10 0 0 0 0 1
footprint=DB25F
T 25200 42300 5 10 0 0 0 0 2
device=FCI 10090099-S254VLF
Digikey 609-4012-ND
}
N 26700 45100 26900 45100 1
N 26900 45100 26900 44300 1
N 26700 44300 26900 44300 1
C 26800 44000 1 0 0 gnd-1.sym
{
T 26800 44000 5 10 0 0 0 0 1
net=GND:1
}
N 25200 47300 24700 47300 1
N 24700 43300 24700 47300 1
N 24700 46500 25200 46500 1
N 24700 45700 25200 45700 1
N 24700 43300 25200 43300 1
C 24600 43000 1 0 0 gnd-1.sym
{
T 24600 43000 5 10 0 0 0 0 1
net=GND:1
}
N 26700 43100 26700 43200 4
U 29500 50000 21200 50000 10 0
U 21200 50000 21200 39400 10 -1
C 21400 46900 1 180 0 busripper-1.sym
{
T 21400 46500 5 8 0 0 180 0 1
device=none
}
C 21400 46100 1 180 0 busripper-1.sym
{
T 21400 45700 5 8 0 0 180 0 1
device=none
}
C 21400 45300 1 180 0 busripper-1.sym
{
T 21400 44900 5 8 0 0 180 0 1
device=none
}
C 21400 44900 1 180 0 busripper-1.sym
{
T 21400 44500 5 8 0 0 180 0 1
device=none
}
C 21400 44500 1 180 0 busripper-1.sym
{
T 21400 44100 5 8 0 0 180 0 1
device=none
}
C 21400 44100 1 180 0 busripper-1.sym
{
T 21400 43700 5 8 0 0 180 0 1
device=none
}
C 21400 43700 1 180 0 busripper-1.sym
{
T 21400 43300 5 8 0 0 180 0 1
device=none
}
C 33800 39200 1 0 0 header50-1.sym
{
T 34050 49900 5 10 0 0 0 0 1
device=HEADER50
T 33800 39200 5 10 0 0 0 0 1
footprint=HEADER50_2
T 34400 49300 1 10 1 1 0 0 1
refdes=J1
}
C 33200 43500 1 0 0 gnd-1.sym
{
T 33200 43500 5 10 0 0 0 0 1
net=GND:1
}
N 33800 44600 33800 49000 1
N 33800 39400 33800 43800 1
N 33800 44600 33300 44600 1
N 33300 44600 33300 43800 1
N 33300 43800 33800 43800 1
C 35800 44300 1 0 0 gnd-1.sym
{
T 35800 44300 5 10 0 0 0 0 1
net=GND:1
}
N 35200 44600 35900 44600 1
N 35900 44600 35900 45400 1
N 35900 45000 35200 45000 1
N 35200 45400 35900 45400 1
C 35400 43300 1 0 0 gnd-1.sym
{
T 35400 43300 5 10 0 0 0 0 1
net=GND:1
}
N 35200 43600 35500 43600 1
N 35200 43400 35200 43800 1
C 35200 42300 1 0 0 gnd-1.sym
{
T 35200 42300 5 10 0 0 0 0 1
net=GND:1
}
N 35200 42600 35300 42600 1
N 35200 49000 37300 49000 4
{
T 35200 49000 5 10 1 1 0 0 1
netname=\_DB0\_
}
C 33300 44100 1 0 0 nc-left-1.sym
{
T 33300 44500 5 10 0 0 0 0 1
value=NoConnection
T 33300 44900 5 10 0 0 0 0 1
device=DRC_Directive
}
N 35200 48200 37300 48200 4
{
T 35200 48200 5 10 1 1 0 0 1
netname=\_DB2\_
}
N 35200 47800 37300 47800 4
{
T 35200 47800 5 10 1 1 0 0 1
netname=\_DB3\_
}
N 35200 47400 37300 47400 4
{
T 35200 47400 5 10 1 1 0 0 1
netname=\_DB4\_
}
N 35200 47000 37300 47000 4
{
T 35200 47000 5 10 1 1 0 0 1
netname=\_DB5\_
}
N 35200 46600 37300 46600 4
{
T 35200 46600 5 10 1 1 0 0 1
netname=\_DB6\_
}
N 35200 46200 37300 46200 4
{
T 35200 46200 5 10 1 1 0 0 1
netname=\_DB7\_
}
N 35200 45800 37300 45800 4
{
T 35200 45800 5 10 1 1 0 0 1
netname=\_DBP\_
}
N 35200 42200 37300 42200 4
{
T 35200 42200 5 10 1 1 0 0 1
netname=\_BSY\_
}
N 35200 41800 37300 41800 4
{
T 35200 41800 5 10 1 1 0 0 1
netname=\_ACK\_
}
N 35200 41400 37300 41400 4
{
T 35200 41400 5 10 1 1 0 0 1
netname=\_RST\_
}
N 35200 41000 37300 41000 4
{
T 35200 41000 5 10 1 1 0 0 1
netname=\_MSG\_
}
N 35200 40600 37300 40600 4
{
T 35200 40600 5 10 1 1 0 0 1
netname=\_SEL\_
}
N 35200 40200 37300 40200 4
{
T 35200 40200 5 10 1 1 0 0 1
netname=\_C/D\_
}
N 35200 39800 37300 39800 4
{
T 35200 39800 5 10 1 1 0 0 1
netname=\_REQ\_
}
N 35200 39400 37300 39400 4
{
T 35200 39400 5 10 1 1 0 0 1
netname=\_I/O\_
}
N 35200 43000 37300 43000 4
{
T 35200 43000 5 10 1 1 0 0 1
netname=\_ATN\_
}
U 37500 49700 37500 39100 10 1
C 37300 49000 1 0 0 busripper-1.sym
{
T 37300 49400 5 8 0 0 0 0 1
device=none
}
C 37300 48200 1 270 0 busripper-1.sym
{
T 37700 48200 5 8 0 0 270 0 1
device=none
}
C 37300 47800 1 270 0 busripper-1.sym
{
T 37700 47800 5 8 0 0 270 0 1
device=none
}
C 37300 47400 1 270 0 busripper-1.sym
{
T 37700 47400 5 8 0 0 270 0 1
device=none
}
C 37300 47000 1 270 0 busripper-1.sym
{
T 37700 47000 5 8 0 0 270 0 1
device=none
}
C 37300 46600 1 270 0 busripper-1.sym
{
T 37700 46600 5 8 0 0 270 0 1
device=none
}
C 37300 46200 1 270 0 busripper-1.sym
{
T 37700 46200 5 8 0 0 270 0 1
device=none
}
C 37300 45800 1 270 0 busripper-1.sym
{
T 37700 45800 5 8 0 0 270 0 1
device=none
}
C 37300 43000 1 270 0 busripper-1.sym
{
T 37700 43000 5 8 0 0 270 0 1
device=none
}
C 37300 42200 1 270 0 busripper-1.sym
{
T 37700 42200 5 8 0 0 270 0 1
device=none
}
C 37300 41800 1 270 0 busripper-1.sym
{
T 37700 41800 5 8 0 0 270 0 1
device=none
}
C 37300 41400 1 270 0 busripper-1.sym
{
T 37700 41400 5 8 0 0 270 0 1
device=none
}
C 37300 41000 1 270 0 busripper-1.sym
{
T 37700 41000 5 8 0 0 270 0 1
device=none
}
C 37300 40600 1 270 0 busripper-1.sym
{
T 37700 40600 5 8 0 0 270 0 1
device=none
}
C 37300 40200 1 270 0 busripper-1.sym
{
T 37700 40200 5 8 0 0 270 0 1
device=none
}
C 37300 39800 1 270 0 busripper-1.sym
{
T 37700 39800 5 8 0 0 270 0 1
device=none
}
C 37300 39400 1 270 0 busripper-1.sym
{
T 37700 39400 5 8 0 0 270 0 1
device=none
}
N 35200 48600 37300 48600 4
{
T 35200 48600 5 10 1 1 0 0 1
netname=\_DB1\_
}
C 37300 48600 1 0 0 busripper-1.sym
{
T 37300 49000 5 8 0 0 0 0 1
device=none
}
N 35200 44200 36200 44200 4
C 36200 44100 1 0 0 output-1.sym
{
T 36300 44400 5 10 0 0 0 0 1
device=OUTPUT
T 36300 44400 5 10 1 1 0 0 1
net=TERMPWR:1
}
U 34000 50000 37500 50000 10 0
U 37500 50000 37500 49700 10 0
C 25200 43000 1 180 0 output-1.sym
{
T 25100 42700 5 10 0 0 180 0 1
device=OUTPUT
T 25100 42700 5 10 1 1 180 0 1
net=TERMPWR:1
}

View File

@ -77,6 +77,7 @@ Compatibility
Amiga 4000 equipped with CyberStorm PPC using 68pin adapter.
Atari TT030 System V
Atari TT running TOS 3.06 with HDDRIVER software version 9.06
Atari Mega ST 1; TOS 1.04; Protar ProFile 30 external hard drive enclosure (1GB size limitation)
Atari MEGA STE
needs J3 TERMPWR jumper
1GB limit (--blocks=2048000). The OS will fail to read the boot sector if the disk is >= 1GB.
@ -91,6 +92,7 @@ Compatibility
Also reported to work on Thinkpad 860 running Win NT 4.0 PowerPC.
AT&T 3B2/600
Sun 2/120 Workstation (Unit Attention disabled)
Sun 4/50 workstation
Data General MV/2500DC running AOS/VS
Vendor: MICROoP
Product: 1578-15 UP
@ -108,6 +110,7 @@ Compatibility
4135 cylinder per volume
1 spare sector per cylinder
2051459 usable sectors on volume
Apollo 400/425s running DOMAIN/OS
Samplers
@ -122,6 +125,7 @@ Samplers
Ensoniq ASR-X, ASR-10 (from v3.4, 2GB size limit)
ASR-10 Requires TERMPWR jumper (applies to pre. 5.0 SCSI2SD boards only)
ASR-X resets when writing to devices > 2Gb.
Ensoniq EPS16+
Kurzweil K2000R
See kurzweil.com for size limits which a dependant on the OS version. Older OS versions have a 1GB limit.
SCSI cable reversed

View File

@ -32,7 +32,7 @@
#include <string.h>
static const uint16_t FIRMWARE_VERSION = 0x0441;
static const uint16_t FIRMWARE_VERSION = 0x0442;
// 1 flash row
static const uint8_t DEFAULT_CONFIG[256] =

View File

@ -169,6 +169,12 @@ static void doReadCapacity()
static void doWrite(uint32 lba, uint32 blocks)
{
if (unlikely(scsiDev.target->cfg->deviceType == CONFIG_FLOPPY_14MB)) {
// Floppies are supposed to be slow. Some systems can't handle a floppy
// without an access time
CyDelay(10);
}
if (unlikely(blockDev.state & DISK_WP) ||
unlikely(scsiDev.target->cfg->deviceType == CONFIG_OPTICAL))
@ -212,6 +218,12 @@ static void doWrite(uint32 lba, uint32 blocks)
static void doRead(uint32 lba, uint32 blocks)
{
if (unlikely(scsiDev.target->cfg->deviceType == CONFIG_FLOPPY_14MB)) {
// Floppies are supposed to be slow. Some systems can't handle a floppy
// without an access time
CyDelay(10);
}
uint32_t capacity = getScsiCapacity(
scsiDev.target->cfg->sdSectorStart,
scsiDev.target->liveCfg.bytesPerSector,
@ -484,6 +496,15 @@ int scsiDiskCommand()
scsiDev.phase = STATUS;
}
}
else if (unlikely(command == 0x37))
{
// READ DEFECT DATA
scsiDev.status = CHECK_CONDITION;
scsiDev.target->sense.code = NO_SENSE;
scsiDev.target->sense.asc = DEFECT_LIST_NOT_FOUND;
scsiDev.phase = STATUS;
}
else
{
commandHandled = 0;

View File

@ -181,19 +181,9 @@ void scsiInquiry()
0,
allocationLength - scsiDev.dataLen);
}
if (scsiDev.cdb[4] == 0 && scsiDev.dataLen < allocationLength)
{
// Only send back the minimum number of bytes.
// Don't forcably send back 256 bytes, as that may cause problems
// with some machines (SGI Iris Indigo running IRIX)
// scsiDev.dataLen is already the correct value.
}
else
{
// Spec 8.2.5 requires us to simply truncate the response if it's
// too big.
scsiDev.dataLen = allocationLength;
}
// Spec 8.2.5 requires us to simply truncate the response if it's
// too big.
scsiDev.dataLen = allocationLength;
// Set the device type as needed.
switch (scsiDev.target->cfg->deviceType)

View File

@ -511,7 +511,6 @@ void scsiPhyInit()
SCSI_Glitch_Ctl_Write(1);
CY_SET_REG8(scsiTarget_datapath__D0_REG, 0);
}
}
// 1 = DBx error

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cydevice.h
* OBSOLETE: Do not use this file. Use the _trm version instead.
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cydevice_trm.h
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cydevicegnu.inc
* OBSOLETE: Do not use this file. Use the _trm version instead.
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cydevicegnu_trm.inc
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
;
; FILENAME: cydeviceiar.inc
; OBSOLETE: Do not use this file. Use the _trm version instead.
; PSoC Creator 3.2 SP1
; PSoC Creator 3.2
;
; DESCRIPTION:
; This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
;
; FILENAME: cydeviceiar_trm.inc
;
; PSoC Creator 3.2 SP1
; PSoC Creator 3.2
;
; DESCRIPTION:
; This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
;
; FILENAME: cydevicerv.inc
; OBSOLETE: Do not use this file. Use the _trm version instead.
; PSoC Creator 3.2 SP1
; PSoC Creator 3.2
;
; DESCRIPTION:
; This file provides all of the address values for the entire PSoC device.

View File

@ -1,7 +1,7 @@
;
; FILENAME: cydevicerv_trm.inc
;
; PSoC Creator 3.2 SP1
; PSoC Creator 3.2
;
; DESCRIPTION:
; This file provides all of the address values for the entire PSoC device.

View File

@ -2907,12 +2907,12 @@
#define BCLK__BUS_CLK__KHZ 50000U
#define BCLK__BUS_CLK__MHZ 50U
#define CY_PROJECT_NAME "SCSI2SD"
#define CY_VERSION "PSoC Creator 3.2 SP1"
#define CY_VERSION "PSoC Creator 3.2"
#define CYDEV_CHIP_DIE_GEN4 2u
#define CYDEV_CHIP_DIE_LEOPARD 1u
#define CYDEV_CHIP_DIE_PANTHER 13u
#define CYDEV_CHIP_DIE_PSOC4A 6u
#define CYDEV_CHIP_DIE_PSOC5LP 12u
#define CYDEV_CHIP_DIE_PANTHER 12u
#define CYDEV_CHIP_DIE_PSOC4A 5u
#define CYDEV_CHIP_DIE_PSOC5LP 11u
#define CYDEV_CHIP_DIE_UNKNOWN 0u
#define CYDEV_CHIP_FAMILY_PSOC3 1u
#define CYDEV_CHIP_FAMILY_PSOC4 2u
@ -2921,17 +2921,16 @@
#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 6u
#define CYDEV_CHIP_MEMBER_4C 10u
#define CYDEV_CHIP_MEMBER_4A 5u
#define CYDEV_CHIP_MEMBER_4C 9u
#define CYDEV_CHIP_MEMBER_4D 3u
#define CYDEV_CHIP_MEMBER_4E 5u
#define CYDEV_CHIP_MEMBER_4F 7u
#define CYDEV_CHIP_MEMBER_4E 4u
#define CYDEV_CHIP_MEMBER_4F 6u
#define CYDEV_CHIP_MEMBER_4G 2u
#define CYDEV_CHIP_MEMBER_4H 4u
#define CYDEV_CHIP_MEMBER_4L 9u
#define CYDEV_CHIP_MEMBER_4M 8u
#define CYDEV_CHIP_MEMBER_5A 12u
#define CYDEV_CHIP_MEMBER_5B 11u
#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_UNKNOWN 0u
#define CYDEV_CHIP_MEMBER_USED CYDEV_CHIP_MEMBER_5B
#define CYDEV_CHIP_DIE_EXPECT CYDEV_CHIP_MEMBER_USED
@ -2964,7 +2963,6 @@
#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_4L_PRODUCTION 0u
#define CYDEV_CHIP_REVISION_4M_PRODUCTION 0u
#define CYDEV_CHIP_REVISION_5A_ES0 0u

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cyfitter_cfg.c
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file contains device initialization code.

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cyfitter_cfg.h
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file provides basic startup and mux configration settings

View File

@ -2908,9 +2908,9 @@
.set BCLK__BUS_CLK__MHZ, 50
.set CYDEV_CHIP_DIE_GEN4, 2
.set CYDEV_CHIP_DIE_LEOPARD, 1
.set CYDEV_CHIP_DIE_PANTHER, 13
.set CYDEV_CHIP_DIE_PSOC4A, 6
.set CYDEV_CHIP_DIE_PSOC5LP, 12
.set CYDEV_CHIP_DIE_PANTHER, 12
.set CYDEV_CHIP_DIE_PSOC4A, 5
.set CYDEV_CHIP_DIE_PSOC5LP, 11
.set CYDEV_CHIP_DIE_UNKNOWN, 0
.set CYDEV_CHIP_FAMILY_PSOC3, 1
.set CYDEV_CHIP_FAMILY_PSOC4, 2
@ -2919,17 +2919,16 @@
.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, 6
.set CYDEV_CHIP_MEMBER_4C, 10
.set CYDEV_CHIP_MEMBER_4A, 5
.set CYDEV_CHIP_MEMBER_4C, 9
.set CYDEV_CHIP_MEMBER_4D, 3
.set CYDEV_CHIP_MEMBER_4E, 5
.set CYDEV_CHIP_MEMBER_4F, 7
.set CYDEV_CHIP_MEMBER_4E, 4
.set CYDEV_CHIP_MEMBER_4F, 6
.set CYDEV_CHIP_MEMBER_4G, 2
.set CYDEV_CHIP_MEMBER_4H, 4
.set CYDEV_CHIP_MEMBER_4L, 9
.set CYDEV_CHIP_MEMBER_4M, 8
.set CYDEV_CHIP_MEMBER_5A, 12
.set CYDEV_CHIP_MEMBER_5B, 11
.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_UNKNOWN, 0
.set CYDEV_CHIP_MEMBER_USED, CYDEV_CHIP_MEMBER_5B
.set CYDEV_CHIP_DIE_EXPECT, CYDEV_CHIP_MEMBER_USED
@ -2962,7 +2961,6 @@
.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_4L_PRODUCTION, 0
.set CYDEV_CHIP_REVISION_4M_PRODUCTION, 0
.set CYDEV_CHIP_REVISION_5A_ES0, 0

View File

@ -2908,9 +2908,9 @@ 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 13
CYDEV_CHIP_DIE_PSOC4A EQU 6
CYDEV_CHIP_DIE_PSOC5LP EQU 12
CYDEV_CHIP_DIE_PANTHER EQU 12
CYDEV_CHIP_DIE_PSOC4A EQU 5
CYDEV_CHIP_DIE_PSOC5LP EQU 11
CYDEV_CHIP_DIE_UNKNOWN EQU 0
CYDEV_CHIP_FAMILY_PSOC3 EQU 1
CYDEV_CHIP_FAMILY_PSOC4 EQU 2
@ -2919,17 +2919,16 @@ 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 6
CYDEV_CHIP_MEMBER_4C EQU 10
CYDEV_CHIP_MEMBER_4A EQU 5
CYDEV_CHIP_MEMBER_4C EQU 9
CYDEV_CHIP_MEMBER_4D EQU 3
CYDEV_CHIP_MEMBER_4E EQU 5
CYDEV_CHIP_MEMBER_4F EQU 7
CYDEV_CHIP_MEMBER_4E EQU 4
CYDEV_CHIP_MEMBER_4F EQU 6
CYDEV_CHIP_MEMBER_4G EQU 2
CYDEV_CHIP_MEMBER_4H EQU 4
CYDEV_CHIP_MEMBER_4L EQU 9
CYDEV_CHIP_MEMBER_4M EQU 8
CYDEV_CHIP_MEMBER_5A EQU 12
CYDEV_CHIP_MEMBER_5B EQU 11
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_UNKNOWN EQU 0
CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B
CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED
@ -2962,7 +2961,6 @@ 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_4L_PRODUCTION EQU 0
CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0
CYDEV_CHIP_REVISION_5A_ES0 EQU 0

View File

@ -2908,9 +2908,9 @@ 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 13
CYDEV_CHIP_DIE_PSOC4A EQU 6
CYDEV_CHIP_DIE_PSOC5LP EQU 12
CYDEV_CHIP_DIE_PANTHER EQU 12
CYDEV_CHIP_DIE_PSOC4A EQU 5
CYDEV_CHIP_DIE_PSOC5LP EQU 11
CYDEV_CHIP_DIE_UNKNOWN EQU 0
CYDEV_CHIP_FAMILY_PSOC3 EQU 1
CYDEV_CHIP_FAMILY_PSOC4 EQU 2
@ -2919,17 +2919,16 @@ 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 6
CYDEV_CHIP_MEMBER_4C EQU 10
CYDEV_CHIP_MEMBER_4A EQU 5
CYDEV_CHIP_MEMBER_4C EQU 9
CYDEV_CHIP_MEMBER_4D EQU 3
CYDEV_CHIP_MEMBER_4E EQU 5
CYDEV_CHIP_MEMBER_4F EQU 7
CYDEV_CHIP_MEMBER_4E EQU 4
CYDEV_CHIP_MEMBER_4F EQU 6
CYDEV_CHIP_MEMBER_4G EQU 2
CYDEV_CHIP_MEMBER_4H EQU 4
CYDEV_CHIP_MEMBER_4L EQU 9
CYDEV_CHIP_MEMBER_4M EQU 8
CYDEV_CHIP_MEMBER_5A EQU 12
CYDEV_CHIP_MEMBER_5B EQU 11
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_UNKNOWN EQU 0
CYDEV_CHIP_MEMBER_USED EQU CYDEV_CHIP_MEMBER_5B
CYDEV_CHIP_DIE_EXPECT EQU CYDEV_CHIP_MEMBER_USED
@ -2962,7 +2961,6 @@ 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_4L_PRODUCTION EQU 0
CYDEV_CHIP_REVISION_4M_PRODUCTION EQU 0
CYDEV_CHIP_REVISION_5A_ES0 EQU 0

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: cymetadata.c
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* This file defines all extra memory spaces that need to be included.

View File

@ -1,7 +1,7 @@
/*******************************************************************************
* FILENAME: project.h
*
* PSoC Creator 3.2 SP1
* PSoC Creator 3.2
*
* DESCRIPTION:
* It contains references to all generated header files and should not be modified.

View File

@ -9,19 +9,36 @@ USE_SYSTEM_ZLIB = Yes
USE_SYSTEM_WX = Yes
endif
ifeq ($(USE_SYSTEM_HIDAPI), Yes)
CPPFLAGS_HIDAPI=$(shell pkg-config hidapi-hidraw --cflags)
LDFLAGS_HIDAPI=$(shell pkg-config hidapi-hidraw --libs)
else
CPPFLAGS_HIDAPI=-I hidapi/hidapi
LDFLAGS_HIDAPI=
endif
ifeq ($(USE_SYSTEM_ZLIB), Yes)
CPPFLAGS_ZLIB=$(shell pkg-config zlib --cflags)
LDFLAGS_ZLIB=$(shell pkg-config zlib --libs)
LIBZIPPER_CONFIG = --disable-shared LDFLAGS="$(LDFLAGS_ZLIB)" CPPFLAGS="$(CPPFLAGS_ZLIB)"
else
CPPFLAGS_ZLIB=-I$(BUILD)/zlib
LDFLAGS_ZLIB=-L$(BUILD)/zlib -lz
LIBZIPPER_CONFIG = --disable-shared LDFLAGS="-L../zlib" CPPFLAGS="-I../zlib"
endif
ifeq ($(USE_SYSTEM_WX),Yes)
LDFLAGS_WX=$(shell wx-config-3.0 --libs)
else
LDFLAGS_WX=$(shell $(BUILD)/wx-config --libs)
endif
CPPFLAGS = -I cybootloaderutils $(CPPFLAGS_HIDAPI) -I. -I ../include -Ilibzipper-1.0.4 $(CPPFLAGS_ZLIB)
CFLAGS += -Wall -Wno-pointer-sign -O2 -g
CXXFLAGS += -Wall -O2 -g -std=c++0x
LDFLAGS_ZLIB=$(shell pkg-config zlib --libs)
LDFLAGS_HIDAPI=$(shell pkg-config hidapi-hidraw --libs)
LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper $(LDFLAGS_ZLIB) $(LDFLAGS_HIDAPI)
LIBZIPPER_CONFIG = --disable-shared LDFLAGS="$(LDFLAGS_ZLIB)" CPPFLAGS="$(CPPFLAGS_ZLIB)"
# wxWidgets 3.0.2 uses broken Webkit headers under OSX Yosemeti
# liblzma not available on OSX 10.7
@ -161,19 +178,11 @@ endif
$(BUILD)/scsi2sd-util$(EXE): $(OBJ) $(BUILD)/scsi2sd-util.o
mkdir -p $(dir $@)
ifneq ($(USE_SYSTEM_WX),Yes)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `$(BUILD)/wx-config --libs` -o $@
else
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `wx-config-3.0 --libs` -o $@
endif
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) $(LDFLAGS_WX) -o $@
$(BUILD)/scsi2sd-monitor$(EXE): $(OBJ) $(BUILD)/scsi2sd-monitor.o
mkdir -p $(dir $@)
ifneq ($(USE_SYSTEM_WX),Yes)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `$(BUILD)/wx-config --libs` -o $@
else
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `wx-config-3.0 --libs` -o $@
endif
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) $(LDFLAGS_WX) -o $@
clean:
rm $(BUILD)/scsi2sd-util$(EXE) $(OBJ) $(BUILD)/libzipper/buildstamp