GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Move x86 I/O functions to include/mock/arch/io.h 

Move th x86 I/O functions declarations from tests mocks to the mock
architecture io.h. This will make x86 I/O-dependent tests simpler,
because the x86_io.h from mocks will not have to be included manually.

Change-Id: Ie7f06c992be306d2523f2079bc90adf114b93946
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58881
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
Jakub Czapiga 2021-11-03 07:12:24 +00:00 committed by Felix Held
parent 19b16a089e
commit 111de557ee
4 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
payloads/libpayload/include/mock/arch/io.h
View File

@ -26,4 +26,21 @@ void write16(volatile void *addr, uint16_t val);
void write32(volatile void *addr, uint32_t val); void write32(volatile void *addr, uint32_t val);
void write64(volatile void *addr, uint64_t val); void write64(volatile void *addr, uint64_t val);
/* x86 I/O functions */
unsigned int inl(int port);
unsigned short inw(int port);
unsigned char inb(int port);
void outl(unsigned int val, int port);
void outw(unsigned short val, int port);
void outb(unsigned char val, int port);
void outsl(int port, const void *addr, unsigned long count);
void outsw(int port, const void *addr, unsigned long count);
void outsb(int port, const void *addr, unsigned long count);
void insl(int port, void *addr, unsigned long count);
void insw(int port, void *addr, unsigned long count);
void insb(int port, void *addr, unsigned long count);
#endif /* _ARCH_IO_H */ #endif /* _ARCH_IO_H */

1
payloads/libpayload/tests/drivers/Makefile.inc
View File

@ -6,4 +6,3 @@ speaker-test-srcs += tests/drivers/speaker-test.c
speaker-test-mocks += inb speaker-test-mocks += inb
speaker-test-mocks += outb speaker-test-mocks += outb
speaker-test-mocks += arch_ndelay speaker-test-mocks += arch_ndelay
speaker-test-cflags += -include $(testsrc)/include/mocks/x86_io.h

1
payloads/libpayload/tests/drivers/speaker-test.c
View File

@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <libpayload.h> #include <libpayload.h>
#include <mocks/x86_io.h>
/* Include source to gain access to private defines */ /* Include source to gain access to private defines */
#include "../drivers/speaker.c" #include "../drivers/speaker.c"

30
payloads/libpayload/tests/include/mocks/x86_io.h
View File

@ -1,30 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef TESTS_MOCKS_X86_IO_H_
#define TESTS_MOCKS_X86_IO_H_
unsigned int inl(int port);
unsigned short inw(int port);
unsigned char inb(int port);
void outl(unsigned int val, int port);
void outw(unsigned short val, int port);
void outb(unsigned char val, int port);
void outsl(int port, const void *addr, unsigned long count);
void outsw(int port, const void *addr, unsigned long count);
void outsb(int port, const void *addr, unsigned long count);
void insl(int port, void *addr, unsigned long count);
void insw(int port, void *addr, unsigned long count);
void insb(int port, void *addr, unsigned long count);
#endif