From bf6bf90871e1d51fb7bb11b48524597a301c11bc Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Mon, 9 Jul 2012 11:18:32 +0000 Subject: [PATCH] Bugfix for RTL8139 driver. Updated imports.inc git-svn-id: svn://kolibrios.org@2851 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/net/drivers/RTL8139.asm | 6 +- kernel/branches/net/drivers/imports.inc | 146 ++++++++++++------------ 2 files changed, 79 insertions(+), 73 deletions(-) diff --git a/kernel/branches/net/drivers/RTL8139.asm b/kernel/branches/net/drivers/RTL8139.asm index 29be9915f2..b75d0570a6 100644 --- a/kernel/branches/net/drivers/RTL8139.asm +++ b/kernel/branches/net/drivers/RTL8139.asm @@ -510,7 +510,7 @@ probe: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; reset: - DEBUGF 2,"Resetting rtl8139: " + DEBUGF 2,"Resetting rtl8139\n" ; attach int handler @@ -617,9 +617,9 @@ reset: mov eax, [device.rx_buffer] mov dword[eax], 0 - DEBUGF 2,"RX buffer:%x\n", eax + DEBUGF 2,"RX buffer: %x\n", eax GetRealAddr - DEBUGF 2,"RX buffer:%X\n", eax + DEBUGF 2,"RX buffer: %x\n", eax set_io REG_RBSTART out dx , eax diff --git a/kernel/branches/net/drivers/imports.inc b/kernel/branches/net/drivers/imports.inc index d1203c8d3b..ea411c6855 100644 --- a/kernel/branches/net/drivers/imports.inc +++ b/kernel/branches/net/drivers/imports.inc @@ -1,15 +1,15 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; macro kernel_export [name]{ forward if used name - if DEBUG - display 'uses: ',`name,#13,#10 - end if ; + if DEBUG + display 'uses: ',`name,#13,#10 + end if extrn name end if } @@ -17,78 +17,84 @@ forward kernel_export \ - RegService,\ - GetService,\ - ServiceHandler,\ - AttachIntHandler,\ - GetIntHandler,\ - FpuSave,\ - FpuRestore,\ - ReservePortArea,\ - Boot_Log,\ + RegService,\ + GetService,\ + ServiceHandler,\ + AttachIntHandler,\ + GetIntHandler,\ + FpuSave,\ + FpuRestore,\ + ReservePortArea,\ + Boot_Log,\ \ - PciApi,\ - PciRead32,\ - PciRead16,\ - PciRead8,\ - PciWrite8,\ - PciWrite16,\ - PciWrite32,\ + MutexInit,\ + MutexLock,\ + MutexUnlock,\ \ - AllocPage,\ - AllocPages,\ - FreePage,\ - MapPage,\ - MapSpace,\ - MapIoMem,\ - GetPgAddr,\ - CommitPages,\ - ReleasePages,\ + PciApi,\ + PciRead32,\ + PciRead16,\ + PciRead8,\ + PciWrite8,\ + PciWrite16,\ + PciWrite32,\ \ - AllocKernelSpace,\ - FreeKernelSpace,\ - KernelAlloc,\ - KernelFree,\ - UserAlloc,\ - UserFree,\ - Kmalloc,\ - Kfree,\ - CreateRingBuffer,\ + AllocPage,\ + AllocPages,\ + FreePage,\ + MapPage,\ + MapSpace,\ + MapIoMem,\ + GetPgAddr,\ + CommitPages,\ + ReleasePages,\ \ - GetPid,\ - CreateObject,\ - DestroyObject,\ - CreateEvent,\ - RaiseEvent,\ - WaitEvent,\ - DestroyEvent,\ - ClearEvent,\ + AllocKernelSpace,\ + FreeKernelSpace,\ + KernelAlloc,\ + KernelFree,\ + UserAlloc,\ + UserFree,\ + Kmalloc,\ + Kfree,\ + CreateRingBuffer,\ \ - LoadCursor,\ - SelectHwCursor,\ - SetHwCursor,\ - HwCursorRestore,\ - HwCursorCreate,\ + GetPid,\ + CreateObject,\ + DestroyObject,\ + CreateEvent,\ + RaiseEvent,\ + WaitEvent,\ + DestroyEvent,\ + ClearEvent,\ \ - SysMsgBoardStr,\ - SysMsgBoardChar,\ - GetCurrentTask,\ - LoadFile,\ - SendEvent,\ - SetMouseData,\ - Sleep,\ - GetTimerTicks,\ + LoadCursor,\ + SelectHwCursor,\ + SetHwCursor,\ + HwCursorRestore,\ + HwCursorCreate,\ \ - strncat,\ - strncpy,\ - strncmp,\ - strnlen,\ - strchr,\ - strrchr,\ + SysMsgBoardStr,\ + SysMsgBoardChar,\ + GetCurrentTask,\ + LoadFile,\ + SendEvent,\ + SetMouseData,\ + Sleep,\ + GetTimerTicks,\ \ - LFBAddress,\ + strncat,\ + strncpy,\ + strncmp,\ + strnlen,\ + strchr,\ + strrchr,\ \ - NetRegDev,\ - NetUnRegDev,\ - NetPtrToNum,\ - EthReceiver + LFBAddress,\ + GetDisplay,\ + SetScreen,\ +\ + NetRegDev,\ + NetUnRegDev,\ + NetPtrToNum,\ + EthReceiver