April 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs
by Nico Huber (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63886 ) Change subject: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS1: > This gets dropped with CB:63724. I think the async is ok for a while. Ack -- To view, visit https://review.coreboot.org/c/flashrom/+/63886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a519c929f7747af70568284823b51678751e285 Gerrit-Change-Number: 63886 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 29 Apr 2022 10:20:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Introduce an `include` directory for header files
by Nico Huber (Code Review) 29 Apr '22

29 Apr '22

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58622 ) Change subject: Introduce an `include` directory for header files ...................................................................... Patch Set 8: (1 comment) Patchset: PS7: > I downloaded this patch on the top of the tree locally, it got applied automatically, no conflict resolutions were needed. I also checked that flash.h in latest patchset is up-to-date (contains SR3 support). You can also use Gerrit's Rebase feature. What you did is exactly what "Rebase on top of the master branch (breaks relation chain)" does. If that fails, nothing happens, if it works, you know the patch applied cleanly (and you, and other, can still verify things in Gerrit). No need to do so, I guess I got used to it because it saves me one switch to the command line and back when I "only wanted to merge something". -- To view, visit https://review.coreboot.org/c/flashrom/+/58622 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Gerrit-Change-Number: 58622 Gerrit-PatchSet: 8 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <martinroth(a)google.com> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Fri, 29 Apr 2022 10:09:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled
by Peter Marheine (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Edward O'Callaghan. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63902 ) Change subject: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/63902 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Gerrit-Change-Number: 63902 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Fri, 29 Apr 2022 06:45:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs
by Thomas Heijligen (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Nico Huber, Angel Pons. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63886 ) Change subject: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs ...................................................................... Patch Set 2: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/63886/comment/a0dee0bd_515d5b0f PS1, Line 9: D > typo: F Done Patchset: PS1: > There's another `-DCONFIG_BITBANG_SPI=1` in `meson.build`. This gets dropped with CB:63724. I think the async is ok for a while. -- To view, visit https://review.coreboot.org/c/flashrom/+/63886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a519c929f7747af70568284823b51678751e285 Gerrit-Change-Number: 63886 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 29 Apr 2022 05:49:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs
by Thomas Heijligen (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Thomas Heijligen. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/63886 to look at the new patch set (#2). Change subject: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs ...................................................................... Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs Drop not needed `-DCONFIG_BITBANG_SPI=1` Change-Id: I2a519c929f7747af70568284823b51678751e285 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile 1 file changed, 5 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/63886/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/63886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a519c929f7747af70568284823b51678751e285 Gerrit-Change-Number: 63886 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: meson: Treat warnings as errors
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63852 ) Change subject: meson: Treat warnings as errors ...................................................................... meson: Treat warnings as errors Makefile treats warnings as errors, so enable the same option for meson. Makefile has an option to disable "warnings as errors" option from command line. The same can be achieved with meson, see scenario 2 below. TEST=I verified the following scenarious 1) check that warnings treated as errors by enforcing higher warning level `meson setup --warnlevel=3 --wipe` `ninja test` shows tons of errors because warning level 3 is pedantic, build fails 2) disable "warning as errors" option from command line `meson configure -Dwerror=false` `ninja test` Now all warnings are non-blocking for build, so tests pass 3) back home `meson configure -Dwerror=true` `meson setup --warnlevel=2 --wipe` `ninja test` No warnings and tests pass 4) defaults: create new directory and run meson will all default options No warnings, all tests pass. Change-Id: I06c72abf1c861f9b35736e02ef7f4a4fb6909b97 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63852 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> --- M meson.build 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve diff --git a/meson.build b/meson.build index 80ccfb3..222f7c1 100644 --- a/meson.build +++ b/meson.build @@ -5,6 +5,7 @@ default_options : [ 'warning_level=2', 'c_std=c99', + 'werror=true', 'optimization=s', 'debug=false'], ) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63852 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I06c72abf1c861f9b35736e02ef7f4a4fb6909b97 Gerrit-Change-Number: 63852 Gerrit-PatchSet: 4 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: Add optimisation level s and disable debug in meson build
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63606 ) Change subject: meson: Add optimisation level s and disable debug in meson build ...................................................................... meson: Add optimisation level s and disable debug in meson build Makefile has optimisation level set explicitly. This patch sets the same level s into meson build. Also disable debug by default to correspond to make builds. These two options (optimisation and debug) are linked together in meson build, so they need to be set together to be properly recognised for builds. Alternative approach would be to use buildtype option (and do not set optimisation and debug). However, none of the standard buildtypes gives a combination that we need: optimisation level s and debug disabled. TEST=ninja test shows no warnings and tests pass Change-Id: I4ca96a866529cac320e66516ef280d5100ceefab Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63606 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M meson.build 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/meson.build b/meson.build index e9eb4d2..80ccfb3 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,11 @@ version : run_command('util/getversion.sh', '--version').stdout().strip(), license : 'GPL-2.0', meson_version : '>=0.50.0', - default_options : ['warning_level=2', 'c_std=c99'], + default_options : [ + 'warning_level=2', + 'c_std=c99', + 'optimization=s', + 'debug=false'], ) # libtool versioning 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63606 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4ca96a866529cac320e66516ef280d5100ceefab Gerrit-Change-Number: 63606 Gerrit-PatchSet: 5 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled
by Sam McNally (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Edward O'Callaghan, Peter Marheine. Sam McNally has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63902 ) Change subject: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/63902 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Gerrit-Change-Number: 63902 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 29 Apr 2022 05:10:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Add -W options from Makefile into meson warning_flags
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58561 ) Change subject: Add -W options from Makefile into meson warning_flags ...................................................................... Add -W options from Makefile into meson warning_flags Makefile options were more restrictive and produced more warnings. This patch adds missing warning options into meson build. Makefile also has -Wall and -Wextra specified explicitly, however this is covered by warning_level=2 which is already set in meson.build. warning_level info: https://github.com/mesonbuild/meson/issues/3275 There are few warning options that are present in meson, but not in Makefile. These are left as is. TEST=ninja test shows no warnings and tests pass Change-Id: Id401bfd642dc3c13d85bd9a2dba56ada38714c25 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58561 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M meson.build 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/meson.build b/meson.build index 32e31df..e9eb4d2 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,8 @@ # hide/enable some warnings warning_flags = [ + '-Wshadow', + '-Wmissing-prototypes', '-Wwrite-strings', '-Wno-unused-parameter', '-Wno-address-of-packed-member', 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/58561 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id401bfd642dc3c13d85bd9a2dba56ada38714c25 Gerrit-Change-Number: 58561 Gerrit-PatchSet: 8 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: tests: Add and include headers with function prototypes
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63489 ) Change subject: tests: Add and include headers with function prototypes ...................................................................... tests: Add and include headers with function prototypes Part 2 of fixing -Wmissing-prototypes warnings. This patch adds headers with function prototypes and includes the headers into source files. This fixes the warnings like this: warning: no previous prototype for ‘function_name’ [-Wmissing-prototypes] This patch is needed to sync compiler warning options between meson and makefile. TEST=running the following produces no warnings: meson setup --wipe (to clean build directory) ninja test Change-Id: Ia1ff22deb2354569f277649c6575ef2d5ffbb6e0 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63489 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/chip.c M tests/flashrom.c M tests/helpers.c M tests/layout.c M tests/libusb_wraps.c A tests/libusb_wraps.h M tests/lifecycle.c M tests/spi25.c M tests/tests.c A tests/wraps.h 10 files changed, 126 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/tests/chip.c b/tests/chip.c index 444d411..6f03172 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> +#include "tests.h" #include "chipdrivers.h" #include "flash.h" #include "io_mock.h" diff --git a/tests/flashrom.c b/tests/flashrom.c index c3508c5..cc88831 100644 --- a/tests/flashrom.c +++ b/tests/flashrom.c @@ -14,6 +14,7 @@ */ #include <include/test.h> +#include "tests.h" #include "programmer.h" diff --git a/tests/helpers.c b/tests/helpers.c index 4376eee..e2e652e 100644 --- a/tests/helpers.c +++ b/tests/helpers.c @@ -15,6 +15,7 @@ #include <include/test.h> +#include "tests.h" #include "flash.h" #include <stdint.h> diff --git a/tests/layout.c b/tests/layout.c index 1e7e31d..e71debf 100644 --- a/tests/layout.c +++ b/tests/layout.c @@ -16,6 +16,7 @@ #include <include/test.h> #include <stdio.h> +#include "tests.h" #include "flash.h" #include "layout.h" #include "libflashrom.h" diff --git a/tests/libusb_wraps.c b/tests/libusb_wraps.c index 8f9e243..4e68ba7 100644 --- a/tests/libusb_wraps.c +++ b/tests/libusb_wraps.c @@ -17,6 +17,7 @@ #include <include/test.h> #include "io_mock.h" +#include "libusb_wraps.h" void *__wrap_usb_dev_get_by_vid_pid_number( libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num) diff --git a/tests/libusb_wraps.h b/tests/libusb_wraps.h new file mode 100644 index 0000000..b10b8c0 --- /dev/null +++ b/tests/libusb_wraps.h @@ -0,0 +1,46 @@ +/* + * This file is part of the flashrom project. + * + * Copyright 2022 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef LIBUSB_WRAPS_H +#define LIBUSB_WRAPS_H + +#include <libusb.h> + +void *__wrap_usb_dev_get_by_vid_pid_number( + libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num); +int __wrap_libusb_init(libusb_context **ctx); +int __wrap_libusb_open(libusb_device *dev, libusb_device_handle **devh); +int __wrap_libusb_set_auto_detach_kernel_driver(libusb_device_handle *devh, int enable); +ssize_t __wrap_libusb_get_device_list(libusb_context *ctx, libusb_device ***list); +void __wrap_libusb_free_device_list(libusb_device **list, int unref_devices); +uint8_t __wrap_libusb_get_bus_number(libusb_device *dev); +uint8_t __wrap_libusb_get_device_address(libusb_device *dev); +int __wrap_libusb_get_device_descriptor(libusb_device *dev, struct libusb_device_descriptor *desc); +int __wrap_libusb_get_config_descriptor( + libusb_device *dev, uint8_t config_index, struct libusb_config_descriptor **config); +void __wrap_libusb_free_config_descriptor(struct libusb_config_descriptor *config); +int __wrap_libusb_get_configuration(libusb_device_handle *devh, int *config); +int __wrap_libusb_set_configuration(libusb_device_handle *devh, int config); +int __wrap_libusb_claim_interface(libusb_device_handle *devh, int interface_number); +int __wrap_libusb_control_transfer(libusb_device_handle *devh, uint8_t bmRequestType, + uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, + uint16_t wLength, unsigned int timeout); +int __wrap_libusb_release_interface(libusb_device_handle *devh, int interface_number); +void __wrap_libusb_close(libusb_device_handle *devh); +libusb_device *__wrap_libusb_ref_device(libusb_device *dev); +void __wrap_libusb_unref_device(libusb_device *dev); +void __wrap_libusb_exit(libusb_context *ctx); + +#endif /* LIBUSB_WRAPS_H */ diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 236d1d7..63fcc3c 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -17,6 +17,7 @@ #include <string.h> #include <linux/spi/spidev.h> +#include "tests.h" #include "libflashrom.h" #include "io_mock.h" #include "programmer.h" diff --git a/tests/spi25.c b/tests/spi25.c index 251c98c..f57251e 100644 --- a/tests/spi25.c +++ b/tests/spi25.c @@ -15,6 +15,8 @@ #include <include/test.h> +#include "wraps.h" +#include "tests.h" #include "programmer.h" #include "flashchips.h" #include "chipdrivers.h" diff --git a/tests/tests.c b/tests/tests.c index 3eef47e..6aabd90 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -16,6 +16,7 @@ #include <include/test.h> #include "io_mock.h" #include "tests.h" +#include "wraps.h" #include <stdio.h> #include <string.h> diff --git a/tests/wraps.h b/tests/wraps.h new file mode 100644 index 0000000..c088d98 --- /dev/null +++ b/tests/wraps.h @@ -0,0 +1,71 @@ +/* + * This file is part of the flashrom project. + * + * Copyright 2022 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef WRAPS_H +#define WRAPS_H + +#include <stdio.h> +#include "flash.h" + +char *__wrap_strdup(const char *s); +void __wrap_physunmap(void *virt_addr, size_t len); +void *__wrap_physmap(const char *descr, uintptr_t phys_addr, size_t len); +struct pci_dev *__wrap_pcidev_init(void *devs, int bar); +uintptr_t __wrap_pcidev_readbar(void *dev, int bar); +void __wrap_sio_write(uint16_t port, uint8_t reg, uint8_t data); +uint8_t __wrap_sio_read(uint16_t port, uint8_t reg); +int __wrap_open(const char *pathname, int flags); +int __wrap_open64(const char *pathname, int flags); +int __wrap___open64_2(const char *pathname, int flags); +int __wrap_ioctl(int fd, unsigned long int request, ...); +int __wrap_write(int fd, const void *buf, size_t sz); +int __wrap_read(int fd, void *buf, size_t sz); +FILE *__wrap_fopen(const char *pathname, const char *mode); +FILE *__wrap_fopen64(const char *pathname, const char *mode); +FILE *__wrap_fdopen(int fd, const char *mode); +int __wrap_stat(const char *path, void *buf); +int __wrap_stat64(const char *path, void *buf); +int __wrap___xstat(const char *path, void *buf); +int __wrap___xstat64(const char *path, void *buf); +int __wrap_fstat(int fd, void *buf); +int __wrap_fstat64(int fd, void *buf); +int __wrap___fxstat(int fd, void *buf); +int __wrap___fxstat64(int fd, void *buf); +char *__wrap_fgets(char *buf, int len, FILE *fp); +char *__wrap___fgets_chk(char *buf, int len, FILE *fp); +size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp); +size_t __wrap_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *fp); +int __wrap_fflush(FILE *fp); +int __wrap_fileno(FILE *fp); +int __wrap_fsync(int fd); +int __wrap_setvbuf(FILE *fp, char *buf, int type, size_t size); +int __wrap_fprintf(FILE *fp, const char *fmt, ...); +int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args); +int __wrap_fclose(FILE *fp); +int __wrap_feof(FILE *fp); +int __wrap_ferror(FILE *fp); +void __wrap_clearerr(FILE *fp); +int __wrap_rget_io_perms(void); +void __wrap_test_outb(unsigned char value, unsigned short port); +unsigned char __wrap_test_inb(unsigned short port); +void __wrap_test_outw(unsigned short value, unsigned short port); +unsigned short __wrap_test_inw(unsigned short port); +void __wrap_test_outl(unsigned int value, unsigned short port); +unsigned int __wrap_test_inl(unsigned short port); +int __wrap_spi_send_command(const struct flashctx *flash, + unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr); + +#endif /* WRAPS_H */ 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63489 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia1ff22deb2354569f277649c6575ef2d5ffbb6e0 Gerrit-Change-Number: 63489 Gerrit-PatchSet: 8 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit April 2022