Changeset 336d2f52 in mainline for uspace/srv/hid/fb

Timestamp:

2011-07-02T21:16:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e944e4c

Parents:

d2fac08c

Message:

Remove support for Sun hardware for which we have no test plan.

This includes the removal of the following functionality only available
via the Simics simulator, for which we have been unable to secure a
license:

• FHC bus and interrupt controller
• Zilog 8530 serial controller attached to Sun keyboard
• Serengeti and SGCN support

Location:

uspace/srv/hid/fb

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (2 diffs)
• niagara.c (modified) (1 diff)
• niagara.h (modified) (1 diff)
• sgcn.c (deleted)
• sgcn.h (deleted)

uspace/srv/hid/fb/Makefile

@@ -84 +84 @@
                 EXTRA_CFLAGS += -DNIAGARA_ENABLED
         endif
-        
-        ifeq ($(MACHINE),serengeti)
-                SOURCES += \
-                        sgcn.c \
-                        serial_console.c
-                EXTRA_CFLAGS += -DSGCN_ENABLED
-        endif
 endif
 

uspace/srv/hid/fb/main.c

@@ -40 +40 @@
 #include "msim.h"
 #include "ski.h"
-#include "sgcn.h"
 #include "niagara.h"
 #include "main.h"
@@ -92 +91 @@
         }
 #endif
-#ifdef SGCN_ENABLED
-        if ((!initialized) && (fb_kind == 4)) {
-                if (sgcn_init() == 0)
-                        initialized = true;
-        }
-#endif
 #ifdef NIAGARA_ENABLED
         if ((!initialized) && (fb_kind == 5)) {

uspace/srv/hid/fb/niagara.c

@@ -29 +29 @@
  */
 
-/** @defgroup niagarafb SGCN
+/** @defgroup niagarafb
  * @brief       userland driver of the Niagara console output
  * @{

uspace/srv/hid/fb/niagara.h

@@ -27 +27 @@
  */
 
-/** @defgroup sgcnfb SGCN
- * @brief       userland driver of the Serengeti console output
+/** @defgroup niagarafb
+ * @brief       userland driver of the Niagara console output
  * @{
  */