Changeset 9e195e2c in mainline for uspace/app/vuhid/hids/bootkbd.c

Timestamp:

2011-05-12T09:03:00Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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 from development

File:

• uspace/app/vuhid/hids/bootkbd.c (modified) (2 diffs)

uspace/app/vuhid/hids/bootkbd.c

@@ -39 +39 @@
 #include <usb/classes/hidut.h>
 
-#include "../../virtusbkbd/report.h"
+#include "../report.h"
 
 uint8_t report_descriptor[] = {
@@ -169 +169 @@
         .on_data_out = on_data_out,
 
-        .live = live
+        .live = live,
+
+        .vuhid_data = NULL
 };