Updates to tree to make it build with all desired changes and the conversion

of the SONIC driver to the new FreeBSD stack instead of KA9Q.

c/src/lib/libbsp/powerpc/dmv177/Makefile.in

@@ -13,13 +13,13 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 SRCS=README
 
-# We only build the ka9q device driver if HAS_KA9Q was defined
+# We only build the networking device driver if HAS_NETWORKING was defined
-KA9Q_DRIVER_yes_V = sonic
+NETWORKING_DRIVER_yes_V = sonic
-KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V)
+NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
 
 all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
 SUB_DIRS=include clock console startup start timer \
-   scv64 tod $(KA9Q_DRIVER) wrapup 
+   scv64 tod $(NETWORKING_DRIVER) wrapup

c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in

@@ -32,7 +32,8 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 # (OPTIONAL) Add local stuff here using +=
 #
 
-DEFINES  +=
+DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
+     -DDIAGNOSTIC -DBOOTP_COMPAT
 CPPFLAGS +=
 CFLAGS   +=
 

c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.h

@@ -12,6 +12,7 @@
 /*
  * $Revision$   $Date$   $Author$
  * $State$
+ * $Id$
  */
 
 #ifndef _SONIC_DP83932_
@@ -248,7 +249,7 @@ struct TransmitDescriptor {
   rtems_unsigned32        link_pad;
 
   /*
-   * Extra RTEMS/KA9Q stuff 
+   * Extra RTEMS stuff 
    */
   struct TransmitDescriptor       *next;  /* Circularly-linked list */
   struct mbuf                     *mbufp; /* First mbuf in packet */
@@ -325,7 +326,7 @@ struct ReceiveDescriptor {
   rtems_unsigned32        in_use;
 
   /*
-   * Extra RTEMS/KA9Q stuff 
+   * Extra RTEMS stuff 
    */
   volatile struct ReceiveDescriptor  *next;  /* Circularly-linked list */
 };

c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in

@@ -8,12 +8,12 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-# We only build the ka9q device driver if HAS_KA9Q was defined
+# We only build the networking device driver if HAS_NETWORKING was defined
-KA9Q_DRIVER_yes_V = sonic
+NETWORKING_DRIVER_yes_V = sonic
-KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V)
+NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
 
 # pieces specific to this BSP
-BSP_PIECES=startup clock console scv64 timer tod $(KA9Q_DRIVER)
+BSP_PIECES=startup clock console scv64 timer tod $(NETWORKING_DRIVER)
 
 # pieces to pick up out of libcpu/$(RTEMS_CPU)
 CPU_PIECES=

c/src/lib/libchip/serial/mc68681.c

@@ -656,8 +656,8 @@ MC68681_STATIC void mc68681_process(
     ucLineStatus >>= 4;
 
   if(ucLineStatus & MC68681_IR_TX_READY) {
-    if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
       Console_Port_Data[minor].bActive = FALSE;
       mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
     }

c/src/lib/libchip/serial/ns16550.c

@@ -487,8 +487,8 @@ NS16550_STATIC void ns16550_process(
         }
 #endif
 
-      if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                  Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
         if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
           ns16550_negate_RTS(minor);
         }

c/src/lib/libchip/serial/z85c30.c

@@ -603,8 +603,8 @@ Z85C30_STATIC void z85c30_process(
     }
 #endif
   
-    if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
       if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
         z85c30_negate_RTS(minor);
       }

c/src/libchip/serial/mc68681.c

@@ -656,8 +656,8 @@ MC68681_STATIC void mc68681_process(
     ucLineStatus >>= 4;
 
   if(ucLineStatus & MC68681_IR_TX_READY) {
-    if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
       Console_Port_Data[minor].bActive = FALSE;
       mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
     }

c/src/libchip/serial/ns16550.c

@@ -487,8 +487,8 @@ NS16550_STATIC void ns16550_process(
         }
 #endif
 
-      if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                  Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
         if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
           ns16550_negate_RTS(minor);
         }

c/src/libchip/serial/z85c30.c

@@ -603,8 +603,8 @@ Z85C30_STATIC void z85c30_process(
     }
 #endif
   
-    if (!rtems_termios_dequeue_characters(
+    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-                Console_Port_Data[minor].termios_data, 1)) {
+    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
       if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
         z85c30_negate_RTS(minor);
       }

make/custom/dmv177.cfg

@@ -99,7 +99,7 @@ HAS_RTC=yes
 #            $(LD_LIBS) \
 #           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
-	$(CC) $(CFLAGS) -o $(basename $@).nxe $(LINK_OBJS)
+	$(CC) $(CFLAGS) -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
 	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe