Changeset efdfebc in mainline for uspace/drv/char/i8042/main.c
- Timestamp:
- 2012-11-06T21:03:44Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 338810f
- Parents:
- de73242 (diff), 94795812 (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/drv/char/i8042/main.c
rde73242 refdfebc 37 37 #include <libarch/inttypes.h> 38 38 #include <ddf/driver.h> 39 #include <devman.h>40 39 #include <device/hw_res_parsed.h> 41 40 #include <errno.h> … … 64 63 * 65 64 */ 66 static int get_my_registers( constddf_dev_t *dev, uintptr_t *io_reg_address,65 static int get_my_registers(ddf_dev_t *dev, uintptr_t *io_reg_address, 67 66 size_t *io_reg_size, int *kbd_irq, int *mouse_irq) 68 67 { 69 68 assert(dev); 70 69 71 async_sess_t *parent_sess = 72 devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle, 73 IPC_FLAG_BLOCKING); 74 if (!parent_sess) 70 async_sess_t *parent_sess = ddf_dev_parent_sess_create( 71 dev, EXCHANGE_SERIALIZE); 72 if (parent_sess == NULL) 75 73 return ENOMEM; 76 74 … … 78 76 hw_res_list_parsed_init(&hw_resources); 79 77 const int ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0); 80 async_hangup(parent_sess);81 78 if (ret != EOK) 82 79 return ret; … … 136 133 137 134 ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").", 138 d evice->name, device->handle);135 ddf_dev_get_name(device), ddf_dev_get_handle(device)); 139 136 return EOK; 140 137 } … … 154 151 { 155 152 printf("%s: HelenOS PS/2 driver.\n", NAME); 156 ddf_log_init(NAME , LVL_NOTE);153 ddf_log_init(NAME); 157 154 return ddf_driver_main(&i8042_driver); 158 155 }
Note:
See TracChangeset
for help on using the changeset viewer.