diff options
| -rw-r--r-- | payloads/libpayload/curses/local.h | 7 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/keyboard.c | 1 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/serial.c | 1 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/video/geode.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/i386/coreboot.c | 1 | ||||
| -rw-r--r-- | payloads/libpayload/i386/sysinfo.c | 1 | ||||
| -rw-r--r-- | payloads/libpayload/include/libpayload.h | 3 | ||||
| -rw-r--r-- | payloads/libpayload/libc/printf.c | 1 |
8 files changed, 3 insertions, 14 deletions
diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h index 0a861ceed8..001edab4ef 100644 --- a/payloads/libpayload/curses/local.h +++ b/payloads/libpayload/curses/local.h @@ -59,8 +59,6 @@ #undef USE_TERMLIB #include <libpayload.h> -#include <arch/types.h> -#include <arch/io.h> #include <curses.h> #include <curses.priv.h> @@ -86,9 +84,4 @@ extern int curses_flags; /* Share the color table for easy lookup */ extern unsigned char color_pairs[256]; -/* speaker.c */ -void speaker_enable(u16 freq); -void speaker_disable(void); -void speaker_tone(u16 freq, unsigned int duration); - #endif diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 9a3e4b8d19..1049b9ccec 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include <arch/io.h> #include <libpayload.h> unsigned char map[2][0x57] = { diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index b3179c756d..a97e7dd808 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -28,7 +28,6 @@ */ #include <libpayload.h> -#include <sysinfo.h> #define IOBASE lib_sysinfo.ser_ioport diff --git a/payloads/libpayload/drivers/video/geode.c b/payloads/libpayload/drivers/video/geode.c index 230926c99a..b0631c55b3 100644 --- a/payloads/libpayload/drivers/video/geode.c +++ b/payloads/libpayload/drivers/video/geode.c @@ -30,9 +30,7 @@ #include <libpayload.h> #include <pci.h> #include <video_console.h> -#include <arch/io.h> #include <arch/msr.h> - #include "font8x16.h" /* This is the video mode that we're going to use for our VGA screen */ diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c index e9bc40fc41..9cbd4ef84a 100644 --- a/payloads/libpayload/i386/coreboot.c +++ b/payloads/libpayload/i386/coreboot.c @@ -28,7 +28,6 @@ */ #include <libpayload.h> -#include <sysinfo.h> #include <coreboot_tables.h> /* diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c index cb149ead3a..7b1f785219 100644 --- a/payloads/libpayload/i386/sysinfo.c +++ b/payloads/libpayload/i386/sysinfo.c @@ -28,7 +28,6 @@ */ #include <libpayload.h> -#include <sysinfo.h> /** * This is a global structure that is used through the library - we set it diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 27668e168e..611f65e432 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -49,6 +49,9 @@ #define BYTE_ORDER BIG_ENDIAN #endif +#define EXIT_SUCCESS 0 +#define EXIT_FAILURE 1 + #define RAND_MAX 0x7fffffff /* Some NVRAM byte definitions */ diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c index 062879c523..2f1ca8bda6 100644 --- a/payloads/libpayload/libc/printf.c +++ b/payloads/libpayload/libc/printf.c @@ -34,7 +34,6 @@ */ #include <libpayload.h> -#include <stdarg.h> /** Structure for specifying output methods for different printf clones. */ struct printf_spec { |