Start to iron out the mods required in switching from the RX RSK hardware to the...

[freertos] / Demo / RX600_RX62N-RDK_GNURX / RTOSDemo / webserver / phy.c

diff --git a/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/webserver/phy.c b/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/webserver/phy.c
index c4f20508f23ba27f04e523d36979b3dbf4a747a4..55e5758b33ab0fc5fa19cb8f9b81255de253bcae 100644 (file)
--- a/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/webserver/phy.c
+++ b/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/webserver/phy.c
@@ -40,7 +40,7 @@
 /******************************************************************************\r
 Includes   <System Includes> , "Project Includes"\r
 ******************************************************************************/\r
-#include <iorx62n.h>\r
+#include <iodefine.h>\r
 #include "r_ether.h"\r
 #include "phy.h"\r
 \r
@@ -65,12 +65,12 @@ Exported global variables and functions (to be accessed by other files)
 /******************************************************************************\r
 Private global variables and functions\r
 ******************************************************************************/\r
-uint16_t  _phy_read( uint16_t reg_addr );\r
-void  _phy_write( uint16_t reg_addr, uint16_t data );\r
+unsigned short  _phy_read( unsigned short reg_addr );\r
+void  _phy_write( unsigned short reg_addr, unsigned short data );\r
 void  _phy_preamble( void );\r
-void  _phy_reg_set( uint16_t reg_addr, int32_t option );\r
-void  _phy_reg_read( uint16_t *data );\r
-void  _phy_reg_write( uint16_t data );\r
+void  _phy_reg_set( unsigned short reg_addr, long option );\r
+void  _phy_reg_read( unsigned short *data );\r
+void  _phy_reg_write( unsigned short data );\r
 void  _phy_ta_z0( void );\r
 void  _phy_ta_10( void );\r
 void  _phy_mii_write_1( void );\r
@@ -86,10 +86,10 @@ void  _phy_mii_write_0( void );
 * Arguments    : none\r
 * Return Value : none\r
 ******************************************************************************/\r
-int16_t  phy_init( void )\r
+short  phy_init( void )\r
 {\r
-  uint16_t reg;\r
-  uint32_t count;\r
+  unsigned short reg;\r
+  unsigned long count;\r
 \r
   /* Reset PHY */\r
   _phy_write(BASIC_MODE_CONTROL_REG, 0x8000);\r
@@ -145,10 +145,10 @@ void phy_set_10half( void )
 *              : bit 4:0 - Always set to 00001 (IEEE 802.3)\r
 *              : -1 if error\r
 ******************************************************************************/\r
-int16_t phy_set_autonegotiate( void )\r
+short phy_set_autonegotiate( void )\r
 {\r
-  uint16_t reg;\r
-  uint32_t count;\r
+  unsigned short reg;\r
+  unsigned long count;\r
 \r
   _phy_write(AN_ADVERTISEMENT_REG, 0x01E1);\r
   _phy_write(BASIC_MODE_CONTROL_REG, 0x1200);\r
@@ -182,7 +182,7 @@ int16_t phy_set_autonegotiate( void )
       _phy_write(0x13, 0x0000);\r
        \r
       /* Get the link partner response */\r
-         reg = (int16_t)_phy_read(AN_LINK_PARTNER_ABILITY_REG);\r
+         reg = (short)_phy_read(AN_LINK_PARTNER_ABILITY_REG);\r
        \r
          if (reg & ( 1 << 8 ) )\r
          {\r
@@ -216,9 +216,9 @@ int16_t phy_set_autonegotiate( void )
 * Arguments    : reg_addr - address of the PHY register\r
 * Return Value : read value\r
 ******************************************************************************/\r
-uint16_t _phy_read( uint16_t reg_addr )\r
+unsigned short _phy_read( unsigned short reg_addr )\r
 {\r
-  uint16_t data;\r
+  unsigned short data;\r
 \r
   _phy_preamble();\r
   _phy_reg_set( reg_addr, PHY_READ );\r
@@ -236,7 +236,7 @@ uint16_t _phy_read( uint16_t reg_addr )
 *              : data - value\r
 * Return Value : none\r
 ******************************************************************************/\r
-void  _phy_write( uint16_t reg_addr, uint16_t data )\r
+void  _phy_write( unsigned short reg_addr, unsigned short data )\r
 {\r
   _phy_preamble();\r
   _phy_reg_set( reg_addr, PHY_WRITE );\r
@@ -254,7 +254,7 @@ void  _phy_write( uint16_t reg_addr, uint16_t data )
 ******************************************************************************/\r
 void  _phy_preamble( void )\r
 {\r
-  int16_t i;\r
+  short i;\r
 \r
   i = 32;\r
   while( i > 0 )\r
@@ -271,10 +271,10 @@ void  _phy_preamble( void )
 *              : option - mode\r
 * Return Value : none\r
 ******************************************************************************/\r
-void  _phy_reg_set( uint16_t reg_addr, int32_t option )\r
+void  _phy_reg_set( unsigned short reg_addr, long option )\r
 {\r
-  int32_t    i;\r
-  uint16_t data;\r
+  long    i;\r
+  unsigned short data;\r
 \r
   data = 0;\r
   data = (PHY_ST << 14);        /* ST code    */\r
@@ -313,10 +313,10 @@ void  _phy_reg_set( uint16_t reg_addr, int32_t option )
 * Arguments    : data - pointer to store the data read\r
 * Return Value : none\r
 ******************************************************************************/\r
-void  _phy_reg_read( uint16_t *data )\r
+void  _phy_reg_read( unsigned short *data )\r
 {\r
-  int32_t      i, j;\r
-  uint16_t   reg_data;\r
+  long      i, j;\r
+  unsigned short   reg_data;\r
 \r
   reg_data = 0;\r
   i = 16;\r
@@ -332,7 +332,7 @@ void  _phy_reg_read( uint16_t *data )
     }\r
 \r
        reg_data <<= 1;\r
-    reg_data |= (uint16_t)((ETHERC.PIR.LONG & 0x00000008) >> 3);  /* MDI read  */\r
+    reg_data |= (unsigned short)((ETHERC.PIR.LONG & 0x00000008) >> 3);  /* MDI read  */\r
 \r
     for(j = MDC_WAIT; j > 0; j--)\r
        {\r
@@ -353,9 +353,9 @@ void  _phy_reg_read( uint16_t *data )
 * Arguments    : data - value to write\r
 * Return Value : none\r
 ******************************************************************************/\r
-void  _phy_reg_write( uint16_t data )\r
+void  _phy_reg_write( unsigned short data )\r
 {\r
-  int32_t  i;\r
+  long  i;\r
 \r
   i = 16;\r
   while( i > 0 )\r
@@ -382,7 +382,7 @@ void  _phy_reg_write( uint16_t data )
 ******************************************************************************/\r
 void  _phy_ta_z0( void )\r
 {\r
-    int32_t j;\r
+    long j;\r
 \r
     for(j = MDC_WAIT; j > 0; j--)\r
        {\r
@@ -423,7 +423,7 @@ void _phy_ta_10(void)
 ******************************************************************************/\r
 void  _phy_mii_write_1( void )\r
 {\r
-    int32_t j;\r
+    long j;\r
 \r
     for(j = MDC_WAIT; j > 0; j--)\r
        {\r
@@ -451,7 +451,7 @@ void  _phy_mii_write_1( void )
 ******************************************************************************/\r
 void  _phy_mii_write_0( void )\r
 {\r
-    int32_t j;\r
+    long j;\r
 \r
     for(j = MDC_WAIT; j > 0; j--)\r
        {\r