Changeset 46b881c in mainline for uspace/srv/hw/netif/ne2000/ne2000.c
- Timestamp:
- 2011-01-29T11:36:41Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0b6931a, 8add9ca5
- Parents:
- e26a4633 (diff), ffa2c8ef (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/netif/ne2000/ne2000.c
re26a4633 r46b881c 43 43 #include <malloc.h> 44 44 #include <sysinfo.h> 45 #include <ipc/ipc.h>46 45 #include <ipc/services.h> 47 46 #include <ipc/ns.h> … … 317 316 ne2k_cmds[5].addr = ne2k->port + DP_TSR; 318 317 319 int rc = ipc_register_irq(ne2k->irq, device->device_id,318 int rc = register_irq(ne2k->irq, device->device_id, 320 319 device->device_id, &ne2k_code); 321 320 if (rc != EOK) … … 324 323 rc = ne2k_up(ne2k); 325 324 if (rc != EOK) { 326 ipc_unregister_irq(ne2k->irq, device->device_id);325 unregister_irq(ne2k->irq, device->device_id); 327 326 return rc; 328 327 } … … 343 342 344 343 ne2k_down(ne2k); 345 ipc_unregister_irq(ne2k->irq, device->device_id);344 unregister_irq(ne2k->irq, device->device_id); 346 345 change_state(device, NETIF_STOPPED); 347 346 } … … 396 395 async_set_interrupt_received(irq_handler); 397 396 398 return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL, NULL);397 return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL); 399 398 } 400 399
Note:
See TracChangeset
for help on using the changeset viewer.