Changeset bfd7aac in mainline for uspace/srv/net/netif/dp8390/dp8390_module.c

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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/srv/net/netif/dp8390/dp8390_module.c (modified) (2 diffs)

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

@@ -208 +208 @@
 }
 
-int netif_probe_message( device_id_t device_id, int irq, int io ){
+int netif_probe_message( device_id_t device_id, int irq, uintptr_t io ){
         ERROR_DECLARE;
 
@@ -280 +280 @@
         if( device->state != NETIF_ACTIVE ){
                 dep = ( dpeth_t * ) device->specific;
-                dp8390_cmds[ 0 ].addr = ( void * ) ( uint32_t ) ( dep->de_dp8390_port + DP_ISR );
+                dp8390_cmds[ 0 ].addr = ( void * ) ( uintptr_t ) ( dep->de_dp8390_port + DP_ISR );
                 dp8390_cmds[ 2 ].addr = dp8390_cmds[ 0 ].addr;
                 ERROR_PROPAGATE( ipc_register_irq( dep->de_irq, device->device_id, device->device_id, & dp8390_code ));