Changeset bf45993 in mainline for uspace/drv/char/xtkbd/main.c

Timestamp:

2014-09-19T10:56:30Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6b646dc

Parents:

824208bf (diff), 58f26cb (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/drv/char/xtkbd/main.c (modified) (4 diffs)

uspace/drv/char/xtkbd/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvkbd
  * @{
@@ -60 +61 @@
 /** Initialize global driver structures (NONE).
  *
+ * Driver debug level is set here.
+ *
  * @param[in] argc Nmber of arguments in argv vector (ignored).
  * @param[in] argv Cmdline argument vector (ignored).
+ *
  * @return Error code.
  *
- * Driver debug level is set here.
  */
 int main(int argc, char *argv[])
@@ -76 +79 @@
  *
  * @param[in] device DDF instance of the device to initialize.
+ *
  * @return Error code.
+ *
  */
 static int xt_kbd_add(ddf_dev_t *device)
@@ -102 +107 @@
         return EOK;
 }
+
 /**
  * @}