Re: [U-Boot] [PATCH 017/126] sandbox: Rename PCI ID for swap_case to be more specific

[Bin Meng]

On Sat, Oct 5, 2019 at 9:58 AM Bin Meng  wrote:
>
> On Wed, Sep 25, 2019 at 10:58 PM Simon Glass  wrote:
> >
> > Rename this ID to SANDBOX_PCI_SWAP_CASE_EMUL_ID since it is more
> > descriptive and allows us to add new PCI emulators without any conflict or
> > confusion.
> >
> > Signed-off-by: Simon Glass 
> > ---
> >
> >  arch/sandbox/include/asm/test.h | 2 +-
> >  drivers/misc/swap_case.c| 5 +++--
> >  test/dm/pci.c   | 6 +++---
> >  3 files changed, 7 insertions(+), 6 deletions(-)
> >
>
> Reviewed-by: Bin Meng 

applied to u-boot-x86/next, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 017/126] sandbox: Rename PCI ID for swap_case to be more specific

[Bin Meng]

On Wed, Sep 25, 2019 at 10:58 PM Simon Glass  wrote:
>
> Rename this ID to SANDBOX_PCI_SWAP_CASE_EMUL_ID since it is more
> descriptive and allows us to add new PCI emulators without any conflict or
> confusion.
>
> Signed-off-by: Simon Glass 
> ---
>
>  arch/sandbox/include/asm/test.h | 2 +-
>  drivers/misc/swap_case.c| 5 +++--
>  test/dm/pci.c   | 6 +++---
>  3 files changed, 7 insertions(+), 6 deletions(-)
>

Reviewed-by: Bin Meng 
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 017/126] sandbox: Rename PCI ID for swap_case to be more specific

[Simon Glass]

Rename this ID to SANDBOX_PCI_SWAP_CASE_EMUL_ID since it is more
descriptive and allows us to add new PCI emulators without any conflict or
confusion.

Signed-off-by: Simon Glass 
---

 arch/sandbox/include/asm/test.h | 2 +-
 drivers/misc/swap_case.c| 5 +++--
 test/dm/pci.c   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h
index cbf209693da..1b21af6bed7 100644
--- a/arch/sandbox/include/asm/test.h
+++ b/arch/sandbox/include/asm/test.h
@@ -12,7 +12,7 @@
 #define SANDBOX_I2C_TEST_ADDR  0x59
 
 #define SANDBOX_PCI_VENDOR_ID  0x1234
-#define SANDBOX_PCI_DEVICE_ID  0x5678
+#define SANDBOX_PCI_SWAP_CASE_EMUL_ID  0x5678
 #define SANDBOX_PCI_CLASS_CODE PCI_CLASS_CODE_COMM
 #define SANDBOX_PCI_CLASS_SUB_CODE PCI_CLASS_SUB_CODE_COMM_SERIAL
 
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 6afc6d9466b..eb32d101f96 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -129,7 +129,7 @@ static int sandbox_swap_case_read_config(struct udevice 
*emul, uint offset,
*valuep = SANDBOX_PCI_VENDOR_ID;
break;
case PCI_DEVICE_ID:
-   *valuep = SANDBOX_PCI_DEVICE_ID;
+   *valuep = SANDBOX_PCI_SWAP_CASE_EMUL_ID;
break;
case PCI_CLASS_DEVICE:
if (size == PCI_SIZE_8) {
@@ -417,7 +417,8 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = {
 };
 
 static struct pci_device_id sandbox_swap_case_supported[] = {
-   { PCI_VDEVICE(SANDBOX, SANDBOX_PCI_DEVICE_ID), SWAP_CASE_DRV_DATA },
+   { PCI_VDEVICE(SANDBOX, SANDBOX_PCI_SWAP_CASE_EMUL_ID),
+   SWAP_CASE_DRV_DATA },
{},
 };
 
diff --git a/test/dm/pci.c b/test/dm/pci.c
index c325f6600e7..e70b65aea4a 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -38,7 +38,7 @@ static int dm_test_pci_busdev(struct unit_test_state *uts)
ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(0, 0x1f, 0), ));
device = 0;
ut_assertok(dm_pci_read_config16(swap, PCI_DEVICE_ID, ));
-   ut_asserteq(SANDBOX_PCI_DEVICE_ID, device);
+   ut_asserteq(SANDBOX_PCI_SWAP_CASE_EMUL_ID, device);
 
/* Test bus#1 and its devices */
ut_assertok(uclass_get_device_by_seq(UCLASS_PCI, 1, ));
@@ -50,7 +50,7 @@ static int dm_test_pci_busdev(struct unit_test_state *uts)
ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(1, 0x0c, 0), ));
device = 0;
ut_assertok(dm_pci_read_config16(swap, PCI_DEVICE_ID, ));
-   ut_asserteq(SANDBOX_PCI_DEVICE_ID, device);
+   ut_asserteq(SANDBOX_PCI_SWAP_CASE_EMUL_ID, device);
 
return 0;
 }
@@ -170,7 +170,7 @@ static int dm_test_pci_mixed(struct unit_test_state *uts)
ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(2, 0x1f, 0), ));
device = 0;
ut_assertok(dm_pci_read_config16(swap, PCI_DEVICE_ID, ));
-   ut_asserteq(SANDBOX_PCI_DEVICE_ID, device);
+   ut_asserteq(SANDBOX_PCI_SWAP_CASE_EMUL_ID, device);
 
/* First test I/O */
io_addr = dm_pci_read_bar32(swap, 0);
-- 
2.23.0.444.g18eeb5a265-goog

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot