DEVEL15-death-to-longc-procs-20060804

[openafs.git] / src / rx / rx_kernel.h

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index bb267c7..2d997ad 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -15,11 +15,7 @@
 #define osi_Alloc afs_osi_Alloc
 #define osi_Free  afs_osi_Free
 
-extern int (*rxk_GetPacketProc)(); /* set to packet allocation procedure */
-extern int (*rxk_PacketArrivalProc)();
-
-extern void rxi_StartListener();
-#define rxi_ReScheduleEvents    0 /* Not needed by kernel */
+#define rxi_ReScheduleEvents    0      /* Not needed by kernel */
 
 /* This is a no-op, because the kernel server procs are pre-allocated */
 #define rxi_StartServerProcs(x) 0
@@ -28,23 +24,30 @@ extern void rxi_StartListener();
 typedef struct socket *osi_socket;
 #define        OSI_NULLSOCKET  ((osi_socket) 0)
 
-extern osi_socket rxi_GetUDPSocket();
-
-#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS)) || (defined(AFS_HPUX_ENV) && !defined(RX_ENABLE_LOCKS))
-#define        osi_rxSleep(a)  afs_osi_Sleep(a)
-#define        osi_rxWakeup(a) afs_osi_Wakeup(a)
+#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS))
+#include "afs/icl.h"
+#include "afs/afs_trace.h"
 #endif
+#define osi_rxSleep(a)  afs_Trace2(afs_iclSetp, CM_TRACE_RXSLEEP, \
+        ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__); afs_osi_Sleep(a)
+#define osi_rxWakeup(a) if (afs_osi_Wakeup(a) == 0) afs_Trace2(afs_iclSetp, \
+        CM_TRACE_RXWAKE, ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__)
 
-extern void osi_Panic();
 extern int osi_utoa(char *buf, size_t len, unsigned long val);
-extern void osi_AssertFailK(const char *expr, const char *file, int line);
 #define osi_Assert(e) (void)((e) || (osi_AssertFailK(#e, __FILE__, __LINE__), 0))
 
 #define        osi_Msg printf)(
+#define osi_VMsg vprintf)(
 
 #define        osi_YieldIfPossible()
 #define        osi_WakeupAndYieldIfPossible(x)     rx_Wakeup(x)
 
-#include "../afs/longc_procs.h"
+#ifndef AFS_DARWIN80_ENV
+#define ifnet_mtu(x) (x)->if_mtu
+#define ifnet_flags(x) (x?(x)->if_flags:0)
+#define AFS_IFNET_T struct ifnet *
+#else
+#define AFS_IFNET_T ifnet_t
+#endif
 
 #endif /* __RX_KERNEL_INCL_ */