Changeset 178673c in mainline

Timestamp:

2010-11-30T00:38:54Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ab3a851

Parents:

6f9e7fea

Message:

rootia32 driver works for amd64 as well

The driver was renamed to rootpc and is available for both
ia32 and amd64.

The PCI and NS8250 drivers were fixed to be compilable under amd64.

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/ns8250/ns8250.c (modified) (1 diff)
• uspace/drv/pciintel/pci.c (modified) (1 diff)
• uspace/drv/rootia32/rootia32.ma (deleted)
• uspace/drv/rootpc/Makefile (moved) (moved from uspace/drv/rootia32/Makefile ) (1 diff)
• uspace/drv/rootpc/rootpc.c (moved) (moved from uspace/drv/rootia32/rootia32.c ) (10 diffs)
• uspace/drv/rootpc/rootpc.ma (added)

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS += \
-        rootia32 \
+        rootpc \
         pciintel \
         isa \

uspace/Makefile

@@ -110 +110 @@
 
 ifeq ($(UARCH),amd64)
+        DIRS += drv/rootpc
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootia32
+        DIRS += drv/rootpc
         DIRS += drv/pciintel
         DIRS += drv/isa

uspace/drv/ns8250/ns8250.c

@@ -274 +274 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *) data->io_addr, REG_COUNT,
+        if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
                 printf(NAME ": error - cannot gain the port %lx for device "

uspace/drv/pciintel/pci.c

@@ -489 +489 @@
             (uint32_t) hw_resources.resources[0].res.io_range.address;
         
-        if (pio_enable((void *)bus_data->conf_io_addr, 8,
+        if (pio_enable((void *)(uintptr_t)bus_data->conf_io_addr, 8,
             &bus_data->conf_addr_port)) {
                 printf(NAME ": failed to enable configuration ports.\n");

uspace/drv/rootpc/Makefile

@@ -30 +30 @@
 LIBS = $(LIBDRV_PREFIX)/libdrv.a
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
-BINARY = rootia32
+BINARY = rootpc
 
 SOURCES = \
-        rootia32.c
+        rootpc.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/rootpc/rootpc.c

@@ -28 +28 @@
 
 /**
- * @defgroup root_ia32 Root HW device driver for ia32 platform.
- * @brief HelenOS root HW device driver for ia32 platform.
+ * @defgroup root_pc Root HW device driver for ia32 and amd64 platform.
+ * @brief HelenOS root HW device driver for ia32 and amd64 platform.
  * @{
  */
@@ -53 +53 @@
 #include <device/hw_res.h>
 
-#define NAME "rootia32"
-
-typedef struct rootia32_child_dev_data {
+#define NAME "rootpc"
+
+typedef struct rootpc_child_dev_data {
         hw_resource_list_t hw_resources;
-} rootia32_child_dev_data_t;
-
-static int rootia32_add_device(device_t *dev);
-static void root_ia32_init(void);
+} rootpc_child_dev_data_t;
+
+static int rootpc_add_device(device_t *dev);
+static void root_pc_init(void);
 
 /** The root device driver's standard operations. */
-static driver_ops_t rootia32_ops = {
-        .add_device = &rootia32_add_device
+static driver_ops_t rootpc_ops = {
+        .add_device = &rootpc_add_device
 };
 
 /** The root device driver structure. */
-static driver_t rootia32_driver = {
+static driver_t rootpc_driver = {
         .name = NAME,
-        .driver_ops = &rootia32_ops
+        .driver_ops = &rootpc_ops
 };
 
@@ -82 +82 @@
 };
 
-static rootia32_child_dev_data_t pci_data = {
+static rootpc_child_dev_data_t pci_data = {
         .hw_resources = {
                 1,
@@ -89 +89 @@
 };
 
-static hw_resource_list_t *rootia32_get_child_resources(device_t *dev)
-{
-        rootia32_child_dev_data_t *data;
-        
-        data = (rootia32_child_dev_data_t *) dev->driver_data;
+static hw_resource_list_t *rootpc_get_child_resources(device_t *dev)
+{
+        rootpc_child_dev_data_t *data;
+        
+        data = (rootpc_child_dev_data_t *) dev->driver_data;
         if (NULL == data)
                 return NULL;
@@ -100 +100 @@
 }
 
-static bool rootia32_enable_child_interrupt(device_t *dev)
+static bool rootpc_enable_child_interrupt(device_t *dev)
 {
         /* TODO */
@@ -108 +108 @@
 
 static resource_iface_t child_res_iface = {
-        &rootia32_get_child_resources,
-        &rootia32_enable_child_interrupt
-};
-
-/* Initialized in root_ia32_init() function. */
-static device_ops_t rootia32_child_ops;
+        &rootpc_get_child_resources,
+        &rootpc_enable_child_interrupt
+};
+
+/* Initialized in root_pc_init() function. */
+static device_ops_t rootpc_child_ops;
 
 static bool
-rootia32_add_child(device_t *parent, const char *name, const char *str_match_id,
-    rootia32_child_dev_data_t *drv_data)
+rootpc_add_child(device_t *parent, const char *name, const char *str_match_id,
+    rootpc_child_dev_data_t *drv_data)
 {
         printf(NAME ": adding new child device '%s'.\n", name);
@@ -142 +142 @@
         
         /* Set provided operations to the device. */
-        child->ops = &rootia32_child_ops;
+        child->ops = &rootpc_child_ops;
         
         /* Register child device. */
@@ -164 +164 @@
 }
 
-static bool rootia32_add_children(device_t *dev)
-{
-        return rootia32_add_child(dev, "pci0", "intel_pci", &pci_data);
+static bool rootpc_add_children(device_t *dev)
+{
+        return rootpc_add_child(dev, "pci0", "intel_pci", &pci_data);
 }
 
@@ -175 +175 @@
  * @return              Zero on success, negative error number otherwise.
  */
-static int rootia32_add_device(device_t *dev)
-{
-        printf(NAME ": rootia32_add_device, device handle = %d\n", dev->handle);
+static int rootpc_add_device(device_t *dev)
+{
+        printf(NAME ": rootpc_add_device, device handle = %d\n", dev->handle);
         
         /* Register child devices. */
-        if (!rootia32_add_children(dev)) {
+        if (!rootpc_add_children(dev)) {
                 printf(NAME ": failed to add child devices for platform "
                     "ia32.\n");
@@ -188 +188 @@
 }
 
-static void root_ia32_init(void)
-{
-        rootia32_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
+static void root_pc_init(void)
+{
+        rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
 }
 
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS rootia32 device driver\n");
-        root_ia32_init();
-        return driver_main(&rootia32_driver);
+        printf(NAME ": HelenOS rootpc device driver\n");
+        root_pc_init();
+        return driver_main(&rootpc_driver);
 }