diff options
| author | Gabe Black <gabeblack@google.com> | 2013-03-12 15:44:56 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-03-18 20:45:48 +0100 |
| commit | a2d786f0e6a0db1c88d955ea80b040bebdea4396 (patch) | |
| tree | 71ac594b9a5d83a843c61f5e7435b0ec8a05238f /payloads/libpayload/drivers | |
| parent | 02fdf718a4b2a7053f19748a0ac0011aa576eb69 (diff) | |
| download | coreboot-a2d786f0e6a0db1c88d955ea80b040bebdea4396.tar.xz | |
libpayload: Make keycode constants available outside of curses.h.
And include the new, split out version in drivers/keyboard.c and
drivers/usb/usbhid.c. Those files were including curses.h just for those
definitions, but the include path was only fixed up to to point to the
libpayload versions of those files if one of the variants of curses was
compiled in. If neither was, gcc would fall back to the system version of that
header which is wrong.
Change-Id: I8c2ee0baf5f0702bd8c713c8dd4613a4bb269ce5
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/2762
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'payloads/libpayload/drivers')
| -rw-r--r-- | payloads/libpayload/drivers/keyboard.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/usb/usbhid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 717ee5541c..cfb4d0bf49 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -27,9 +27,9 @@ * SUCH DAMAGE. */ +#include <keycodes.h> #include <libpayload-config.h> #include <libpayload.h> -#include <curses.h> #define I8042_CMD_READ_MODE 0x20 #define I8042_CMD_WRITE_MODE 0x60 diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index ee8ba63842..f14bda0c04 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -29,8 +29,8 @@ // #define USB_DEBUG +#include <keycodes.h> #include <usb/usb.h> -#include <curses.h> enum { hid_subclass_none = 0, hid_subclass_boot = 1 }; typedef enum { hid_proto_boot = 0, hid_proto_report = 1 } hid_proto; |