Browse Source

Resolve header file inclusion issue

kurisaw 1 year ago
parent
commit
00a15cf438
3 changed files with 1 additions and 59 deletions
  1. 1 1
      include/pnet_api.h
  2. 0 1
      src/ports/rtthread/pn_dev/app_utils.h
  3. 0 57
      src/ports/rtthread/pnal/pnal.c

+ 1 - 1
include/pnet_api.h

@@ -43,7 +43,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdint.h>
-#include <stdio.h>
+#include <sys/time.h>
 
 
 #define PNET_PRODUCT_NAME_MAX_LEN  25 /* Not including termination */
 #define PNET_PRODUCT_NAME_MAX_LEN  25 /* Not including termination */
 #define PNET_ORDER_ID_MAX_LEN      20 /* Not including termination */
 #define PNET_ORDER_ID_MAX_LEN      20 /* Not including termination */

+ 0 - 1
src/ports/rtthread/pn_dev/app_utils.h

@@ -32,7 +32,6 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-#include "osal.h"
 #include "pnal.h"
 #include "pnal.h"
 #include <pnet_api.h>
 #include <pnet_api.h>
 
 

+ 0 - 57
src/ports/rtthread/pnal/pnal.c

@@ -179,57 +179,8 @@ static pnal_eth_mau_t calculate_mau_type (uint8_t link_state)
    }
    }
 }
 }
 
 
-/**
- * Calculate advertised capabilities
- *
- * @param capabilities     In:    rt-kernel advertised capabilities as a
- *                                bitfield.
- * @return Profinet advertised capabilities as a bitfield.
- */
-static uint16_t calculate_capabilities (uint32_t capabilities)
-{
-   uint16_t out = 0;
-
-//   if (capabilities & PHY_CAPABILITY_10)
-//   {
-//      out |= PNAL_ETH_AUTONEG_CAP_10BaseT_HALF_DUPLEX;
-//   }
-//   if (capabilities & PHY_CAPABILITY_10_FD)
-//   {
-//      out |= PNAL_ETH_AUTONEG_CAP_10BaseT_FULL_DUPLEX;
-//   }
-//   if (capabilities & PHY_CAPABILITY_100)
-//   {
-//      out |= PNAL_ETH_AUTONEG_CAP_100BaseTX_HALF_DUPLEX;
-//   }
-//   if (capabilities & PHY_CAPABILITY_100_FD)
-//   {
-//      out |= PNAL_ETH_AUTONEG_CAP_100BaseTX_FULL_DUPLEX;
-//   }
-//
-//   if (out == 0)
-//   {
-//      out |= PNAL_ETH_AUTONEG_CAP_UNKNOWN;
-//   }
-//   printf("do not realize calculate_capabilities!\n");
-
-   return PNAL_ETH_AUTONEG_CAP_100BaseTX_FULL_DUPLEX;
-}
-
 int pnal_eth_get_status (const char * interface_name, pnal_eth_status_t * status)
 int pnal_eth_get_status (const char * interface_name, pnal_eth_status_t * status)
 {
 {
-  struct eth_device *ethif;
-//  struct netif * netif;
-
-//  LOCK_TCPIP_CORE();
-//  netif = netif_find (interface_name);
-//  UNLOCK_TCPIP_CORE();
-
-//  CC_ASSERT (netif != NULL);
-
-//  ethif = netif->state;
-//  CC_ASSERT (ethif != NULL);
-
   status->is_autonegotiation_supported = true;
   status->is_autonegotiation_supported = true;
   status->is_autonegotiation_enabled = true;
   status->is_autonegotiation_enabled = true;
   status->autonegotiation_advertised_capabilities =
   status->autonegotiation_advertised_capabilities =
@@ -239,14 +190,6 @@ int pnal_eth_get_status (const char * interface_name, pnal_eth_status_t * status
   status->running = true;
   status->running = true;
 
 
   return 0;
   return 0;
-   //  status->is_autonegotiation_supported = false;
-   //  status->is_autonegotiation_enabled = false;
-   //  status->autonegotiation_advertised_capabilities = 0;
-
-   //  status->operational_mau_type = PNAL_ETH_MAU_COPPER_100BaseTX_FULL_DUPLEX;
-   //  status->running = true;
-
-   //  return 0;
 }
 }
 
 
 int pnal_save_file (
 int pnal_save_file (