Changeset e6edc8d1 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2013-07-11T19:13:37Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (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 with mainline changes.

File:

• uspace/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -63 +63 @@
 #define i8042_AUX_DISABLE    0x20
 #define i8042_KBD_TRANSLATE  0x40  /* Use this to switch to XT scancodes */
-
-#define CHECK_RET_DESTROY(ret, msg...) \
-        do { \
-                if (ret != EOK) { \
-                        ddf_msg(LVL_ERROR, msg); \
-                        if (dev->kbd_fun) { \
-                                dev->kbd_fun->driver_data = NULL; \
-                                ddf_fun_destroy(dev->kbd_fun); \
-                        } \
-                        if (dev->aux_fun) { \
-                                dev->aux_fun->driver_data = NULL; \
-                                ddf_fun_destroy(dev->aux_fun); \
-                        } \
-                } \
-        } while (0)
-
-#define CHECK_RET_UNBIND_DESTROY(ret, msg...) \
-        do { \
-                if (ret != EOK) { \
-                        ddf_msg(LVL_ERROR, msg); \
-                        if (dev->kbd_fun) { \
-                                ddf_fun_unbind(dev->kbd_fun); \
-                                dev->kbd_fun->driver_data = NULL; \
-                                ddf_fun_destroy(dev->kbd_fun); \
-                        } \
-                        if (dev->aux_fun) { \
-                                ddf_fun_unbind(dev->aux_fun); \
-                                dev->aux_fun->driver_data = NULL; \
-                                ddf_fun_destroy(dev->aux_fun); \
-                        } \
-                } \
-        } while (0)
 
 void default_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);