Changeset b473611 in mainline for uspace/srv

Timestamp:

2010-02-13T23:56:33Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3a3a619

Parents:

e70edd1 (diff), b86d436 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the sparc branch.
Both sun4u and sun4v appear to work.
HM cleanup is pending.

Location:

uspace/srv/hid

Files:

• fb/Makefile.build (modified) (1 diff)
• fb/main.c (modified) (2 diffs)
• fb/niagara.c (added)
• fb/niagara.h (added)
• kbd/Makefile.build (modified) (1 diff)
• kbd/port/niagara.c (added)

uspace/srv/hid/fb/Makefile.build

@@ -72 +72 @@
 
 ifeq ($(UARCH),sparc64)
-        SOURCES += sgcn.c \
-                serial_console.c
-        CFLAGS += -DSGCN_ENABLED
+        ifeq ($(PROCESSOR), sun4v)
+                SOURCES += niagara.c \
+                        serial_console.c
+                CFLAGS += -DNIAGARA_ENABLED
+        endif
+
+        ifeq ($(MACHINE), serengeti)
+                SOURCES += sgcn.c \
+                        serial_console.c
+                CFLAGS += -DSGCN_ENABLED
+        endif
 endif
 

uspace/srv/hid/fb/main.c

@@ -41 +41 @@
 #include "ski.h"
 #include "sgcn.h"
+#include "niagara.h"
 #include "main.h"
 
@@ -88 +89 @@
         }
 #endif
+#ifdef NIAGARA_ENABLED
+        if ((!initialized) && (sysinfo_value("fb.kind") == 5)) {
+                if (niagara_init() == 0)
+                        initialized = true;
+        }
+#endif
 #ifdef SKI_ENABLED
         if ((!initialized) && (sysinfo_value("fb") != true)) {

uspace/srv/hid/kbd/Makefile.build

@@ -130 +130 @@
 
 ifeq ($(UARCH),sparc64)
-        ifeq ($(MACHINE),serengeti)
+        ifeq ($(PROCESSOR),sun4v)
                 SOURCES += \
-                        port/sgcn.c \
+                        port/niagara.c \
                         ctl/stty.c
         else
-                SOURCES += \
+                ifeq ($(MACHINE),serengeti)
+                        SOURCES += \
+                                port/sgcn.c \
+                                ctl/stty.c
+                endif
+                ifeq ($(MACHINE),generic)
+                        SOURCES += \
                         port/sun.c \
                         port/z8530.c \
                         port/ns16550.c \
                         ctl/sun.c
+                endif
         endif
 endif