summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog1
-rw-r--r--cpukit/libnetworking/net/netisr.h21
2 files changed, 7 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 416a2fb40e..00478ab630 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,6 @@
2007-03-29 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * libnetworking/net/netisr.h: Partial update from FreeBSD.
* libcsupport/src/getpwent.c: Remove bogus cast to long.
* libnetworking/libc/strsep.c: Don't build if provided by libc.
* libnetworking/libc/rcmd.c: Eliminate __P(). Cosmetics.
diff --git a/cpukit/libnetworking/net/netisr.h b/cpukit/libnetworking/net/netisr.h
index 2500f3f46c..2dc99a3cc2 100644
--- a/cpukit/libnetworking/net/netisr.h
+++ b/cpukit/libnetworking/net/netisr.h
@@ -59,26 +59,17 @@
#define NETISR_CCITT 10 /* same as AF_CCITT */
#define NETISR_ATALK 16 /* same as AF_APPLETALK */
#define NETISR_ARP 18 /* same as AF_LINK */
-#define NETISR_IPX 23 /* same as AF_IPX */
-#define NETISR_ISDN 26 /* same as AF_E164 */
-#define NETISR_PPP 27 /* PPP soft interrupt */
-
-#define schednetisr(anisr) rtems_bsdnet_schednetisr(anisr)
+#define NETISR_IPX 23 /* same as AF_IPX */
+#define NETISR_USB 25 /* USB soft interrupt */
+#define NETISR_PPP 26 /* PPP soft interrupt */
#ifndef LOCORE
#ifdef _KERNEL
-extern volatile unsigned int netisr; /* scheduling bits for network */
-
-typedef void netisr_t(void);
-struct netisrtab {
- int nit_num;
- netisr_t *nit_isr;
-};
+#define NETISR_SET(num, isr) /* FIXME: dummy, should be removed */
-#define NETISR_SET(num, isr)
-
-int register_netisr __P((int, netisr_t *));
+extern volatile unsigned int netisr; /* scheduling bits for network */
+#define schednetisr(anisr) rtems_bsdnet_schednetisr(anisr)
#endif
#endif