# HG changeset patch
# User jlarmour
# Date 1049919802 0
# Node ID ca9b63c5e56a4c69bdd049e4f21806a0d5c2d46a
# Parent  c4e02a82f57322f4487250102fd09d4b0bccd5fb
	* cdl/ks32c5000_eth.cdl: CYGINT_DEVS_ETH_ARM_KS32C5000_PHY can now
	be zero or one to allow for no PHY station management control.
	* src/ks5000_ether.c: Changed '#if HavePHY' to
	'#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY'

diff --git a/packages/devs/eth/arm/ks32c5000/current/ChangeLog b/packages/devs/eth/arm/ks32c5000/current/ChangeLog
--- a/packages/devs/eth/arm/ks32c5000/current/ChangeLog
+++ b/packages/devs/eth/arm/ks32c5000/current/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-08  Michael Checky  <Michael_Checky@Thermoking.com>
+
+	* cdl/ks32c5000_eth.cdl: CYGINT_DEVS_ETH_ARM_KS32C5000_PHY can now
+	be zero or one to allow for no PHY station management control.
+	* src/ks5000_ether.c: Changed '#if HavePHY' to
+	'#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY'
+
 2003-03-27  Jay Foster   <jay@systech.com>
 
 	* src/ics1890.c: Added configurable PHY MII address.
diff --git a/packages/devs/eth/arm/ks32c5000/current/cdl/ks32c5000_eth.cdl b/packages/devs/eth/arm/ks32c5000/current/cdl/ks32c5000_eth.cdl
--- a/packages/devs/eth/arm/ks32c5000/current/cdl/ks32c5000_eth.cdl
+++ b/packages/devs/eth/arm/ks32c5000/current/cdl/ks32c5000_eth.cdl
@@ -60,7 +60,7 @@ cdl_package CYGPKG_DEVS_ETH_ARM_KS32C500
     implements    CYGHWR_NET_DRIVERS
     implements    CYGHWR_NET_DRIVER_ETH0
     requires      (CYGPKG_CRC || (!(CYG_HAL_CPUTYPE == \"KS32C5000A\" )))
-    requires      (CYGINT_DEVS_ETH_ARM_KS32C5000_PHY == 1)
+    requires      (CYGINT_DEVS_ETH_ARM_KS32C5000_PHY <= 1)
 
     include_dir   net
     description   "Ethernet driver for Samsung KS32C5000"
@@ -74,7 +74,7 @@ cdl_package CYGPKG_DEVS_ETH_ARM_KS32C500
         no_define
 
         cdl_interface CYGINT_DEVS_ETH_ARM_KS32C5000_PHY {
-            display     "PHY support"
+            display     "PHY Station Management support"
         }
         
         cdl_option CYGPKG_DEVS_ETH_ARM_KS32C5000_DEBUG_LEVEL {
diff --git a/packages/devs/eth/arm/ks32c5000/current/src/ks5000_ether.c b/packages/devs/eth/arm/ks32c5000/current/src/ks5000_ether.c
--- a/packages/devs/eth/arm/ks32c5000/current/src/ks5000_ether.c
+++ b/packages/devs/eth/arm/ks32c5000/current/src/ks5000_ether.c
@@ -89,14 +89,13 @@
 #define cyg_drv_dsr_unlock()        /* noop */
 #endif
 
-#define HavePHY 1
 #define HavePHYinterrupt 0
 
 #include "std.h"
 #include "ks5000_regs.h"
 #include "ks5000_ether.h"
 
-#if HavePHY
+#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY
 #include "phy.h"
 #endif
 
@@ -124,7 +123,7 @@
 #define SoftwareCRC 0
 #endif
 
-#if HavePHY
+#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY
 // functions to read/write Phy chip registers via MII interface
 // on 32c5000.  These need to be non-static since they're used
 // by PHY-specific routines in a different file.
@@ -642,7 +641,7 @@ static int EthInit(U08* mac_address)
   else
     debug2_printf("EthInit(NULL)\n");
 
-#if HavePHY  
+#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY
   PhyReset();
 #endif
   
@@ -760,7 +759,7 @@ static void Init_RxFrameDescriptorArray(
   return;
 }
 
-#if HavePHY
+#if CYGINT_DEVS_ETH_ARM_KS32C5000_PHY
 
 #if HavePHYinterrupt
 static unsigned linkStatus;