Changeset fdbc3ff in mainline for uspace/srv/hw

Timestamp:

2010-11-19T23:50:06Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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.

Location:

uspace/srv/hw

Files:

• bus/cuda_adb/cuda_adb.c (modified) (8 diffs)
• bus/cuda_adb/cuda_adb.h (modified) (1 diff)
• char/i8042/i8042.c (modified) (3 diffs)
• char/i8042/i8042.h (modified) (1 diff)
• char/s3c24xx_uart/s3c24xx_uart.c (modified) (1 diff)
• char/s3c24xx_uart/s3c24xx_uart.h (modified) (1 diff)
• netif/dp8390/dp8390.c (modified) (1 diff)
• netif/dp8390/dp8390_module.c (modified) (2 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -143 +143 @@
 int main(int argc, char *argv[])
 {
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         int rc;
         int i;
@@ -151 +151 @@
         for (i = 0; i < ADB_MAX_ADDR; ++i) {
                 adb_dev[i].client_phone = -1;
-                adb_dev[i].dev_handle = 0;
+                adb_dev[i].devmap_handle = 0;
         }
 
@@ -160 +160 @@
         }
 
-        rc = devmap_device_register("adb/kbd", &dev_handle);
+        rc = devmap_device_register("adb/kbd", &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -167 +167 @@
         }
 
-        adb_dev[2].dev_handle = dev_handle;
-        adb_dev[8].dev_handle = dev_handle;
-
-        rc = devmap_device_register("adb/mouse", &dev_handle);
+        adb_dev[2].devmap_handle = devmap_handle;
+        adb_dev[8].devmap_handle = devmap_handle;
+
+        rc = devmap_device_register("adb/mouse", &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -177 +177 @@
         }
 
-        adb_dev[9].dev_handle = dev_handle;
+        adb_dev[9].devmap_handle = devmap_handle;
 
         if (cuda_init() < 0) {
@@ -196 +196 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int retval;
         int dev_addr, i;
@@ -206 +206 @@
         dev_addr = -1;
         for (i = 0; i < ADB_MAX_ADDR; i++) {
-                if (adb_dev[i].dev_handle == dh)
+                if (adb_dev[i].devmap_handle == dh)
                         dev_addr = i;
         }
@@ -237 +237 @@
                          */
                         for (i = 0; i < ADB_MAX_ADDR; ++i) {
-                                if (adb_dev[i].dev_handle == dh) {
+                                if (adb_dev[i].devmap_handle == dh) {
                                         adb_dev[i].client_phone = IPC_GET_ARG5(call);
                                 }

uspace/srv/hw/bus/cuda_adb/cuda_adb.h

@@ -104 +104 @@
 
 typedef struct {
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         int client_phone;
 } adb_dev_t;

uspace/srv/hw/char/i8042/i8042.c

@@ -145 +145 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = devmap_device_register(name, &i8042_port[i].dev_handle);
+                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -218 +218 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int retval;
         int dev_id, i;
@@ -230 +230 @@
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].dev_handle == dh)
+                if (i8042_port[i].devmap_handle == dh)
                         dev_id = i;
         }

uspace/srv/hw/char/i8042/i8042.h

@@ -52 +52 @@
 /** Softstate structure, one for each serial port (primary and aux). */
 typedef struct {
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         int client_phone;
 } i8042_port_t;

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -92 +92 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->dev_handle);
+        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

@@ -88 +88 @@
 
         /** Device handle */
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 } s3c24xx_uart_t;
 

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -62 +62 @@
  *  @param[in] dep The network interface structure.
  *  @param[in] packet The outgoing packet.
- *  @returns EOK on success.
- *  @returns EINVAL 
+ *  @return EOK on success.
+ *  @return EINVAL 
  */
 int queue_packet(dpeth_t * dep, packet_t packet);

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -157 +157 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
+{
         netif_device_t * device;
         eth_stat_t * de_stat;
@@ -185 +186 @@
 }
 
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
+int netif_get_addr_message(device_id_t device_id, measured_string_t *address){
         netif_device_t * device;
         int rc;