Commit b68a065c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Build fix

Export our platform specific EtherDevice header, it's very tightly coupled to EtherTH.
Fix C exports too - was erroring trying to find $(HDR).
Manually tested in an exports phase.

Version 0.34. Tagged as 'EtherTH-0_34'
parent 869121d0
hdr/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
c/** gitlab-language=c linguist-language=c linguist-detectable=true
h/** gitlab-language=c linguist-language=c linguist-detectable=true
cmhg/** gitlab-language=cmhg linguist-language=cmhg linguist-detectable=true
......@@ -34,7 +34,8 @@ TARGET ?= EtherTH
# The CMHG and resources object files are added automatically, so don't need to be listed
OBJS = module device utils dci dcierror dcifilter mii ar8031
HDRS =
ASMHDRS = EtherDevice
CMHGFILE = ModuleHdr
CMHGDEPENDS = module device dcierror
CINCLUDES = -ITCPIPLibs:,C:
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.33"
Module_Version SETA 33
Module_MajorVersion SETS "0.34"
Module_Version SETA 34
Module_MinorVersion SETS ""
Module_Date SETS "06 Jan 2018"
Module_ApplicationDate SETS "06-Jan-18"
Module_Date SETS "25 Mar 2018"
Module_ApplicationDate SETS "25-Mar-18"
Module_ComponentName SETS "EtherTH"
Module_ComponentPath SETS "mixed/RiscOS/Sources/Networking/Ethernet/EtherTH"
Module_FullVersion SETS "0.33"
Module_HelpVersion SETS "0.33 (06 Jan 2018)"
Module_FullVersion SETS "0.34"
Module_HelpVersion SETS "0.34 (25 Mar 2018)"
END
/* (0.33)
/* (0.34)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.33
#define Module_MajorVersion_CMHG 0.34
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Jan 2018
#define Module_Date_CMHG 25 Mar 2018
#define Module_MajorVersion "0.33"
#define Module_Version 33
#define Module_MajorVersion "0.34"
#define Module_Version 34
#define Module_MinorVersion ""
#define Module_Date "06 Jan 2018"
#define Module_Date "25 Mar 2018"
#define Module_ApplicationDate "06-Jan-18"
#define Module_ApplicationDate "25-Mar-18"
#define Module_ComponentName "EtherTH"
#define Module_ComponentPath "mixed/RiscOS/Sources/Networking/Ethernet/EtherTH"
#define Module_FullVersion "0.33"
#define Module_HelpVersion "0.33 (06 Jan 2018)"
#define Module_LibraryVersionInfo "0:33"
#define Module_FullVersion "0.34"
#define Module_HelpVersion "0.34 (25 Mar 2018)"
#define Module_LibraryVersionInfo "0:34"
; Copyright 2018 Castle Technology Ltd
;
; 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.
;
[ :LNOT: :DEF: __HAL_ENETDevice_HDR__
GBLL __HAL_ENETDevice_HDR__
; Define a HAL device to let the HAL pass addresses to modules
GET Hdr:HALDevice
^ 0
HALDevice_ENET # HALDeviceSize
; Additional device fields
HALDevice_ENET_Phy_Device # 4 ; Phy IRQ number
HALDevice_ENET_Phy_IRQ_En # 4 ; IRQ enable/disable
HALDevice_ENET_Phy_IRQ_Test # 4 ; phy irqbit test
HALDevice_ENET_Phy_IRQ_Clear # 4 ; phy irqbit clear
; the next 2 are exported explicitly to permit quick test of phy interrupt
HALDevice_ENET_Phy_IRQTAddr # 4 ; phy irq test address
HALDevice_ENET_Phy_IRQTMask # 4 ; phy irq test active bit mask
HALDevice_ENETSpecificField # 4
HALDevice_ENETClock # 4
HALDevice_ENET_PhyPwrRst # 4 ; Phy power and reset control
HALDevice_ENET_Size * :INDEX: @
] ; __HAL_ENETDevice_HDR__
END
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment