Changes in / [f834dd81:eca820c] in mainline

Files:

• Makefile (modified) (1 diff)
• boot/arch/sparc64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/intctl/obio/Makefile (deleted)
• uspace/drv/intctl/obio/main.c (deleted)
• uspace/drv/intctl/obio/obio.c (deleted)
• uspace/drv/intctl/obio/obio.h (deleted)
• uspace/drv/intctl/obio/obio.ma (deleted)
• uspace/drv/platform/sun4u/sun4u.c (modified) (3 diffs)
• uspace/srv/hw/irc/obio/Makefile (added)
• uspace/srv/hw/irc/obio/obio.c (added)

Makefile

@@ -1 @@
-x#
+#
 # Copyright (c) 2006 Martin Decky
 # All rights reserved.

boot/arch/sparc64/Makefile.inc

@@ -43 +43 @@
         bus/pci/pciintel \
         bus/isa \
-        intctl/obio \
         char/ns8250
 
 RD_DRV_CFG += \
         bus/isa
+
+RD_SRVS_NON_ESSENTIAL +=
+
+RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hw/irc/obio/obio
 
 SOURCES = \

uspace/Makefile

@@ -135 +135 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hw/irc/obio \
         srv/hid/rfb \
         drv/audio/hdaudio \
@@ -169 +170 @@
         drv/intctl/i8259 \
         drv/intctl/icp-ic \
-        drv/intctl/obio \
         drv/nic/ne2k \
         drv/nic/e1k \

uspace/drv/platform/sun4u/sun4u.c

@@ -68 +68 @@
 #define PBM_PCI_MEM_SIZE        UINT64_C(0x00100000000)
 
-#define PBM_OBIO_BASE           UINT64_C(0)
-#define PBM_OBIO_SIZE           UINT64_C(0x1898)
-
-
 typedef struct sun4u_fun {
         hw_resource_list_t hw_resources;
@@ -89 +85 @@
         .name = NAME,
         .driver_ops = &sun4u_ops
-};
-
-static hw_resource_t obio_res[] = {
-        {
-                .type = MEM_RANGE,
-                .res.mem_range = {
-                        .address = PBM_BASE + PBM_OBIO_BASE,
-                        .size = PBM_OBIO_SIZE,
-                        .relative = false,
-                        .endianness = LITTLE_ENDIAN
-                }
-        }
-};
-
-static sun4u_fun_t obio_data = {
-        .hw_resources = {
-                .count = sizeof(obio_res) / sizeof(obio_res[0]),
-                .resources = obio_res
-        },
-        .pio_window = {
-                .mem = {
-                        .base = PBM_BASE + PBM_OBIO_BASE,
-                        .size = PBM_OBIO_SIZE
-                }
-        }
 };
 
@@ -230 +201 @@
 static bool sun4u_add_functions(ddf_dev_t *dev)
 {
-        if (!sun4u_add_fun(dev, "obio", "ebus/obio", &obio_data))
-                return false;
-
         return sun4u_add_fun(dev, "pci0", "intel_pci", &pci_data);
 }