# HG changeset patch
# User asl
# Date 1195556406 0
# Node ID 0f68ebea87e6eeb44ea0d52afe9c8e3d44ac25c5
# Parent  4631139fc77477dd7d3b3b5398f9d7e0aa9433a5
        * cdl/usbs_at91.cdl: Fixed typos in
	CYGNUM_DEVS_USB_AT91_GPIO_PULLUP_INVERTED and
	CYGNUM_DEVS_USB_AT91_GPIO_READ_POWER_INVERTED. Fixing the typo.

	* src/usbs_at91.c (usbs_at91_set_pullup): Change the logic so that
	CYGNUM_DEVS_USB_AT91_GPIO_PULLUP_INVERTED does actually cause an
	invert when set true.

diff --git a/packages/devs/usb/at91/current/ChangeLog b/packages/devs/usb/at91/current/ChangeLog
--- a/packages/devs/usb/at91/current/ChangeLog
+++ b/packages/devs/usb/at91/current/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-20  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/usbs_at91.cdl: Fixed typos in
+	CYGNUM_DEVS_USB_AT91_GPIO_PULLUP_INVERTED and
+	CYGNUM_DEVS_USB_AT91_GPIO_READ_POWER_INVERTED. Fixing the typo.
+
+	* src/usbs_at91.c (usbs_at91_set_pullup): Change the logic so that
+	CYGNUM_DEVS_USB_AT91_GPIO_PULLUP_INVERTED does actually cause an
+	invert when set true.
+	
 2006-09-07  John Eigelaar  <jeigelaar@mweb.co.za>
 
 	* cdl/usbs_at91.c: Read actual EP addresses from the EP configuartion
diff --git a/packages/devs/usb/at91/current/cdl/usbs_at91.cdl b/packages/devs/usb/at91/current/cdl/usbs_at91.cdl
--- a/packages/devs/usb/at91/current/cdl/usbs_at91.cdl
+++ b/packages/devs/usb/at91/current/cdl/usbs_at91.cdl
@@ -103,13 +103,14 @@ cdl_package CYGPKG_DEVS_USB_AT91 {
                    then select NONE"
         }
 
-        cdl_option CYGNUM_DEVS_USB_AT91_PIO_SET_PULLUP_INVERTED {
+        cdl_option CYGNUM_DEVS_USB_AT91_GPIO_SET_PULLUP_INVERTED {
             display       "Has the signal to be inverted?"
             flavor        bool
             default_value 1
             description "
                    This option indicates that the pullup pin should
-                   be inverted. ie VDD is active, VCC is inactive."
+                   be inverted. ie VDD is active, VCC is inactive. For the
+                   AT91SAM7SEK it needs to be inverted, hence this default."
         }
 
         cdl_option CYGDAT_DEVS_USB_AT91_GPIO_READ_POWER_PIN {
@@ -121,7 +122,7 @@ cdl_package CYGPKG_DEVS_USB_AT91 {
                    a pin then select NONE"
         }
 
-        cdl_option CYGNUM_DEVS_USB_AT91_PIO_READ_POWER_INVERTED {
+        cdl_option CYGNUM_DEVS_USB_AT91_GPIO_READ_POWER_INVERTED {
             display       "Has the signal to be inverted?"
             flavor        bool
             default_value 0
@@ -206,4 +207,4 @@ cdl_package CYGPKG_DEVS_USB_AT91 {
                     devices on the target hardware to prevent a name clash."
             }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/devs/usb/at91/current/src/usbs_at91.c b/packages/devs/usb/at91/current/src/usbs_at91.c
--- a/packages/devs/usb/at91/current/src/usbs_at91.c
+++ b/packages/devs/usb/at91/current/src/usbs_at91.c
@@ -285,9 +285,9 @@ usbs_at91_set_pullup (bool set)
       set
 #endif
       ) {
-    HAL_ARM_AT91_GPIO_RESET(CYGDAT_DEVS_USB_AT91_GPIO_SET_PULLUP_PIN);
+     HAL_ARM_AT91_GPIO_SET(CYGDAT_DEVS_USB_AT91_GPIO_SET_PULLUP_PIN);
   } else {
-    HAL_ARM_AT91_GPIO_SET(CYGDAT_DEVS_USB_AT91_GPIO_SET_PULLUP_PIN);
+     HAL_ARM_AT91_GPIO_RESET(CYGDAT_DEVS_USB_AT91_GPIO_SET_PULLUP_PIN);
   }
 #endif
 }