Changeset 357b5f5 in mainline for uspace/drv/rootpc/rootpc.c

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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 mainline changes.

File:

• uspace/drv/rootpc/rootpc.c (moved) (moved from uspace/drv/rootia32/rootia32.c ) (10 diffs)

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 PC platform driver.
+ * @brief HelenOS PC platform driver.
  * @{
  */
@@ -50 +50 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <ops/hw_res.h>
 #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 */
@@ -107 +107 @@
 }
 
-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;
+static hw_res_ops_t child_hw_res_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",
+            (int)dev->handle);
         
         /* Register child devices. */
-        if (!rootia32_add_children(dev)) {
-                printf(NAME ": failed to add child devices for platform "
-                    "ia32.\n");
+        if (!rootpc_add_children(dev)) {
+                printf(NAME ": failed to add child devices for PC platform.\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_hw_res_ops;
 }
 
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS rootia32 device driver\n");
-        root_ia32_init();
-        return driver_main(&rootia32_driver);
+        printf(NAME ": HelenOS PC platform driver\n");
+        root_pc_init();
+        return driver_main(&rootpc_driver);
 }