Index: /trunk/FirmwareFX2/hw_basic.c
===================================================================
--- /trunk/FirmwareFX2/hw_basic.c	(revision 18)
+++ /trunk/FirmwareFX2/hw_basic.c	(revision 19)
@@ -27,26 +27,26 @@
 //-----------------------------------------------------------------------------
 
-/* JTAG TDI, AS ASDI, PS DATA0 */
+/* JTAG TDI */
 
 sbit at 0xB3          TDI; /* Port D.3 */
-#define bmTDIOE       bmBIT0
+#define bmTDIOE       bmBIT3
 #define SetTDI(x)     do{TDI=(x);}while(0)
 
-/* JTAG TCK, AS/PS DCLK */
+/* JTAG TCK */
 
 sbit at 0xB2          TCK; /* Port D.2 */
-#define bmTCKOE       bmBIT3
+#define bmTCKOE       bmBIT2
 #define SetTCK(x)     do{TCK=(x);}while(0)
 
-/* JTAG TMS, AS/PS nCONFIG */
+/* JTAG TMS */
 
 sbit at 0xB1          TMS; /* Port D.1 */
-#define bmTMSOE       bmBIT2
+#define bmTMSOE       bmBIT1
 #define SetTMS(x)     do{TMS=(x);}while(0)
 
-/* JTAG TDO, AS/PS CONF_DONE */
+/* JTAG TDO */
 
 sbit at 0xB0          TDO; /* Port D.0 */
-#define bmTDOOE       bmBIT1
+#define bmTDOOE       bmBIT0
 #define GetTDO(x)     TDO
 
@@ -56,5 +56,5 @@
 
   sbit at 0xB4        OELED; /* Port D.4 */
-  #define bmOELEDOE   bmBIT7
+  #define bmOELEDOE   bmBIT4
   #define SetOELED(x) do{OELED=(x);}while(0)
 
@@ -88,8 +88,8 @@
   CPUCS = bmCLKOE | bmCLKSPD1;
 
-  // Use external clock, use "Slave FIFO" mode for all pins
-  IFCONFIG = bmIFCFG1 | bmIFCFG0;
-
-  // TDO input, others output
+  // Use internal 48 MHz, enable output, use "Port" mode for all pins
+  IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmIFCFG1 | bmIFCFG0;
+
+  // Output enable (TDO input, others output)
   OED = (OED&~bmPROGINOE) | bmPROGOUTOE;
 }
@@ -101,6 +101,4 @@
    * d.0 => TCK
    * d.1 => TMS
-   * d.2 => nCE (only #ifdef HAVE_AS_MODE)
-   * d.3 => nCS (only #ifdef HAVE_AS_MODE)
    * d.4 => TDI
    * d.5 => LED / Output Enable
@@ -121,9 +119,8 @@
    *
    * TDO => d.0
-   * DATAOUT => d.1 (only #ifdef HAVE_AS_MODE)
    */
 
   ProgIO_Set_State(d);
-  return 2|GetTDO(); /* DATAOUT assumed high, no AS mode */
+  return 2|GetTDO();
 }
 
@@ -132,5 +129,5 @@
 void ProgIO_ShiftOut(unsigned char c)
 {
-  /* Shift out byte C: 
+  /* Shift out byte C:
    *
    * 8x {
@@ -276,3 +273,2 @@
 
 
-