X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=fx2%2Ffx2.c;h=c52c81b082282a25b992ced01b2a9ef69ec2e57b;hb=6b7ac2a1220c38d01b25fb8a3c9ec649e9398fda;hp=6b2fe21fc15af8769ad4325bfebdc2913fdc1a60;hpb=df3c4395bc496254267b53c2e4ae1ee879f1a00d;p=my-code%2Ffpga.git

diff --git a/fx2/fx2.c b/fx2/fx2.c
index 6b2fe21..c52c81b 100644
--- a/fx2/fx2.c
+++ b/fx2/fx2.c
@@ -3,9 +3,9 @@
  *
  * author: hackbard@hackdaworld.org
  *
- * number of priorities:
- * - switch on board power
- * - allow high speed usb transfer
+ * feature list:
+ * - switch on board power (done)
+ * - allow high speed bulk usb transfer
  * - do jtag
  * 
  */
@@ -30,13 +30,18 @@ xdata at 0xe600 volatile u8 CPUCS;
 xdata at 0xe601 volatile u8 IFCONFIG;
 
 /* endpoint configuration */
+xdata at 0xe604 volatile u8 FIFORESET;
 xdata at 0xe60b volatile u8 REVCTL;
 xdata at 0xe612 volatile u8 EP2CFG;
+xdata at 0xe613 volatile u8 EP4CFG;
 xdata at 0xe614 volatile u8 EP6CFG;
+xdata at 0xe615 volatile u8 EP8CFG;
 xdata at 0xe618 volatile u8 EP2FIFOCFG;
 xdata at 0xe619 volatile u8 EP4FIFOCFG;
 xdata at 0xe61a volatile u8 EP6FIFOCFG;
 xdata at 0xe61b volatile u8 EP8FIFOCFG;
+xdata at 0xe624 volatile u8 EP6AUTOINLENH;
+xdata at 0xe625 volatile u8 EP6AUTOINLENL;
 
 /* special funtion registers */
 sfr at 0xb5 OED;
@@ -50,9 +55,9 @@ sfr at 0xb0 IOD;
 	nop; nop; nop; nop; nop; nop; nop; nop; \
 	nop; _endasm
 
-void power_on() {
+void power_init() {
 
-	/* high level must be applied to the mosfet gate for power on
+	/* pin 7 of port d connected to mosfet gate controlling the board power
 	 *
 	 * ref: http://digilentinc.com/Data/Products/NEXYS/Nexys_sch.pdf
 	 */
@@ -60,8 +65,30 @@ void power_on() {
 	/* configure pin 7 of port d as output */
 	OED|=(1<<7);
 
-	/* pull it high */
-	IOD|=(1<<7);
+}
+
+void toggle_power() {
+
+	/* toggle high/low state of the mosfet gate */
+
+	if((IOD&(1<<7)))
+		IOD&=~(1<<7);
+	else
+		IOD|=(1<<7);
+
+}
+
+void cpu_init() {
+
+	/* cpu initialization: (0x10)
+	 * - 48 mhz
+	 * - none inverted signal
+	 * - no clk out
+	 */
+
+	CPUCS=(1<<4);
+	SYNCDELAY;
+
 }
 
 void slave_fifo_init() {
@@ -71,21 +98,28 @@ void slave_fifo_init() {
 
 	/* set bit 0 and 1 - fifo slave config */	
 	IFCONFIG|=0x03;
+	SYNCDELAY;
 
 	/* async mode */
 	IFCONFIG|=0x04;
+	SYNCDELAY;
 
 	/* p. 180: must be set to 1 */
 	REVCTL|=((1<<0)|(1<<1));
+	SYNCDELAY;
 
 	/* 8 bit fifo to all endpoints
 	 *
 	 * ('or' of all these bits define port d functionality)
 	 */
 	EP2FIFOCFG&=~(1<<0);
+	SYNCDELAY;
 	EP4FIFOCFG&=~(1<<0);
+	SYNCDELAY;
 	EP6FIFOCFG&=~(1<<0);
+	SYNCDELAY;
 	EP8FIFOCFG&=~(1<<0);
+	SYNCDELAY;
 
 	/* default indexed flag configuration:
 	 *
@@ -98,39 +132,50 @@ void slave_fifo_init() {
 
 	/* endpoint configuration:
 	 *
-	 * (assuming 'high bandwidth in' [fpga -> host]
-	 *  and 'low bandwidth out' [host->fpga] applications)
-	 * 
-	 * ep2: bulk in 3x1024
-	 * ep6: bulk out 2x512
+	 * ep2: bulk in 4x512
+	 * ep6: bulk out 4x512
 	 *
-	 * 0xeb = 1 1 1 0 1 0 1 1 = bulk in 3x1024
-	 * 0xa2 = 1 0 1 0 0 0 1 0 = bulk out 2x512
+	 * 0xa0 = 1 0 1 0 0 0 0 0 = bulk out 4x512
+	 * 0xe0 = 1 1 1 0 0 0 0 0 = bulk in 4x512
 	 * 0x01 = 0 0 0 0 0 0 0 1 = invalid (bit,type,buf)
 	 */
-	EP2CFG=0xeb;
+	EP2CFG=0xa0;
+	SYNCDELAY;
 	EP4CFG=0x01;
-	EP6CFG=0xa2;
+	SYNCDELAY;
+	EP6CFG=0xe0;
+	SYNCDELAY;
 	EP8CFG=0x01;
+	SYNCDELAY;
 
 	/* reset the fifo */
 	FIFORESET=0x80; /* nak all transfers */
+	SYNCDELAY;
 	FIFORESET=0x02; /* reset ep2 */
+	SYNCDELAY;
 	FIFORESET=0x06; /* reset ep6 */
+	SYNCDELAY;
 	FIFORESET=0x00; /* restore normal operation */
+	SYNCDELAY;
+
+	/* auto in/out, no cpu interaction! auto in len = 512 */
+	EP2FIFOCFG|=(1<<4);
+	SYNCDELAY;
+	EP6FIFOCFG|=(1<<3);
+	SYNCDELAY;
+	EP6AUTOINLENH=(1<<1);
+	SYNCDELAY;
+	EP6AUTOINLENL=0;
+	SYNCDELAY;
 
-	/* auto in/out, no cpu interaction! auto in len = 1024 */
-	EP2FIFOCFG|=(1<<3);
-	EP2AUTOINLENH=(1<<2);
-	EP2AUTOINLENL=0;
-	EP6FIFOCFG|=(1<<4);
-
-	/* maybe OUTPKTEND necessary (with skip=1) */
 }
 
 void ep1_init() {
 
-	/* initialize endpoint 1 (will be used for jtag) */
+	/* initialize endpoint 1
+	 *
+	 * used for jtag & control
+	 */
 
 	/* endpoint 1 configuration:
 	 *
@@ -141,13 +186,18 @@ void ep1_init() {
 
 void fx2_init() {
 
-	/* swicth on power */
-	power_on();
+	/* cpu init */
+	cpu_init();
+
+	/* power init & power on */
+	power_init();
+	toggle_power();
 
 	/* slave fifo init */
 	slave_fifo_init();
 
-	/* ep1_init(); */
+	/* ep1 init */
+	ep1_init();
 }
 
 void main() {