From 0789d7283fc4db8d744fad1536fde205133b8fc2 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Sat, 9 Feb 2013 17:01:56 +0000 Subject: [PATCH] rtl8169: Update to new PCI HIDD definitions Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@46555 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/devs/networks/rtl8169/rtl8101_hw.c | 13 ++----------- workbench/devs/networks/rtl8169/rtl8168_hw.c | 12 ++---------- workbench/devs/networks/rtl8169/rtl8169.c | 16 ++++------------ workbench/devs/networks/rtl8169/rtl8169_hw.c | 7 +------ 4 files changed, 9 insertions(+), 39 deletions(-) diff --git a/workbench/devs/networks/rtl8169/rtl8101_hw.c b/workbench/devs/networks/rtl8169/rtl8101_hw.c index 465848be5c..3dee1936fa 100644 --- a/workbench/devs/networks/rtl8169/rtl8101_hw.c +++ b/workbench/devs/networks/rtl8169/rtl8101_hw.c @@ -5,20 +5,11 @@ void rtl_hw_start_8101(struct net_device *unit) struct rtl8169_priv *np = get_pcnpriv(unit); APTR base = get_hwbase(unit); - struct pHidd_PCIDevice_WriteConfigWord pciword; - if ((np->mcfg == RTL_GIGA_MAC_VER_13) || (np->mcfg == RTL_GIGA_MAC_VER_16)) { - pciword.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigWord); - pciword.reg = 0x68; - pciword.val = 0x00; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pciword); - - pciword.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigWord); - pciword.reg = 0x69; - pciword.val = 0x09; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pciword); + HIDD_PCIDevice_WriteConfigWord(unit->rtl8169u_PCIDevice, 0x68, 0x00); + HIDD_PCIDevice_WriteConfigWord(unit->rtl8169u_PCIDevice, 0x69, 0x09); } RTL_W8(base + Cfg9346, Cfg9346_Unlock); diff --git a/workbench/devs/networks/rtl8169/rtl8168_hw.c b/workbench/devs/networks/rtl8169/rtl8168_hw.c index 8f80df7717..a1b0f5bbde 100644 --- a/workbench/devs/networks/rtl8169/rtl8168_hw.c +++ b/workbench/devs/networks/rtl8169/rtl8168_hw.c @@ -60,8 +60,6 @@ void rtl_hw_start_8168(struct net_device *unit) APTR base = get_hwbase(unit); UBYTE ctl; - struct pHidd_PCIDevice_WriteConfigByte pcibyte; - RTL_W8(base + Cfg9346, Cfg9346_Unlock); RTL_W8(base + EarlyTxThres, EarlyTxThld); @@ -75,15 +73,9 @@ void rtl_hw_start_8168(struct net_device *unit) RTL_W16(base + CPlusCmd, np->cp_cmd); /* Tx performance tweak. */ - - pcibyte.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_ReadConfigByte); - pcibyte.reg = 0x69; - ctl = (UBYTE) OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pcibyte); + ctl = HIDD_PCIDevice_ReadConfigByte(unit->rtl8169u_PCIDevice, 0x69); ctl = (ctl & ~0x70) | 0x50; - pcibyte.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigByte); - pcibyte.reg = 0x69; - pcibyte.val = ctl; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pcibyte); + HIDD_PCIDevice_WriteConfigByte(unit->rtl8169u_PCIDevice, 0x69, ctl); RTL_W16(base + IntrMitigate, 0x5151); diff --git a/workbench/devs/networks/rtl8169/rtl8169.c b/workbench/devs/networks/rtl8169/rtl8169.c index 10116b8b1f..2027070029 100644 --- a/workbench/devs/networks/rtl8169/rtl8169.c +++ b/workbench/devs/networks/rtl8169/rtl8169.c @@ -777,8 +777,6 @@ static void rtl8169_phy_reset(struct net_device *unit) static void rtl8169_Init(struct net_device *unit) { - struct pHidd_PCIDevice_WriteConfigByte pcibyte; - struct rtl8169_priv *np = get_pcnpriv(unit); APTR base = get_hwbase(unit); UBYTE autoneg, duplex; @@ -875,17 +873,11 @@ static void rtl8169_Init(struct net_device *unit) RTLD(bug("[%s] rtl8169_Init: PHY Configured\n", unit->rtl8169u_name)) - pcibyte.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigByte); - pcibyte.reg = PCI_LATENCY_TIMER; - pcibyte.val = 0x40; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pcibyte); + HIDD_PCIDevice_WriteConfigByte(unit->rtl8169u_PCIDevice, PCI_LATENCY_TIMER, 0x40); - if (np->mcfg <= RTL_GIGA_MAC_VER_06) - { - pcibyte.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigByte); - pcibyte.reg = PCI_CACHE_LINE_SIZE; - pcibyte.val = 0x08; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pcibyte); + if (np->mcfg <= RTL_GIGA_MAC_VER_06) + { + HIDD_PCIDevice_WriteConfigByte(unit->rtl8169u_PCIDevice, PCI_CACHE_LINE_SIZE, 0x08); } if (np->mcfg == RTL_GIGA_MAC_VER_02) diff --git a/workbench/devs/networks/rtl8169/rtl8169_hw.c b/workbench/devs/networks/rtl8169/rtl8169_hw.c index 681fb1aa0e..a3a6fd4619 100644 --- a/workbench/devs/networks/rtl8169/rtl8169_hw.c +++ b/workbench/devs/networks/rtl8169/rtl8169_hw.c @@ -147,8 +147,6 @@ void rtl_hw_start_8169(struct net_device *unit) struct rtl8169_priv *np = get_pcnpriv(unit); APTR base = get_hwbase(unit); - struct pHidd_PCIDevice_WriteConfigByte pcibyte; - // UBYTE device_control; // UWORD ephy_data; // ULONG csi_tmp; @@ -157,10 +155,7 @@ void rtl_hw_start_8169(struct net_device *unit) if (np->mcfg == RTL_GIGA_MAC_VER_05) { RTL_W16(base + CPlusCmd, RTL_R16(base + CPlusCmd) | PCIMulRW); - pcibyte.mID = OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigByte); - pcibyte.reg = PCI_CACHE_LINE_SIZE; - pcibyte.val = 0x08; - OOP_DoMethod(unit->rtl8169u_PCIDevice, (OOP_Msg) &pcibyte); + HIDD_PCIDevice_WriteConfigByte(unit->rtl8169u_PCIDevice, PCI_CACHE_LINE_SIZE, 0x08); } RTL_W8(base + (Cfg9346), Cfg9346_Unlock); -- 2.11.4.GIT