cleanup net.headers

eRINA_STM32F7/src/net/net-headers.ads

@@ -1,20 +1,3 @@
------------------------------------------------------------------------
---  net-headers -- Network headers
---  Copyright (C) 2016 Stephane Carrez
---  Written by Stephane Carrez ([email protected])
---
---  Licensed under the Apache License, Version 2.0 (the "License");
---  you may not use this file except in compliance with the License.
---  You may obtain a copy of the License at
---
---      http://www.apache.org/licenses/LICENSE-2.0
---
---  Unless required by applicable law or agreed to in writing, software
---  distributed under the License is distributed on an "AS IS" BASIS,
---  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---  See the License for the specific language governing permissions and
---  limitations under the License.
------------------------------------------------------------------------
 package Net.Headers is
 
    pragma Preelaborate;
@@ -57,8 +40,8 @@ package Net.Headers is
 
    --  ARP Ethernet packet
    type Arp_Packet is record
-      Ethernet : Net.Headers.Ether_Header;
-      Arp      : Net.Headers.Ether_Arp;
+      Ethernet : Ether_Header;
+      Arp      : Ether_Arp;
    end record;
    type Arp_Packet_Access is access all Arp_Packet;
 
@@ -98,8 +81,6 @@ package Net.Headers is
       QOS_Id      : Uint16;
    end record;
 
-   type EFCP_Header_Access is access all EFCP_Header;
-
    for EFCP_Header use record
       PDU_Version at  0 range 0 ..  7;
       PDU_Type    at  1 range 0 ..  7;
@@ -115,18 +96,14 @@ package Net.Headers is
       QOS_Id      at 26 range 0 .. 15;
    end record;
 
-   type Ether_EFCP is record
-      Efcp_Hdr : EFCP_Header;
-   end record;
-
-   type Ether_EFCP_Access is access all Ether_EFCP;
+   type EFCP_Header_Access is access all EFCP_Header;
 
    --  EFCP Ethernet packet
    type EFCP_Packet is record
-      Ethernet : Net.Headers.Ether_Header;
-      Arp      : Net.Headers.Ether_EFCP;
+      Ethernet : Ether_Header;
+      Efcp     : EFCP_Header;
    end record;
 
    type EFCP_Packet_Access is access all EFCP_Packet;
 
-end Net.Headers;
+end Net.Headers;