projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: Move the tree/uclass dump code into its own file
[oweals/u-boot.git]
/
test
/
dm
/
spi.c
diff --git
a/test/dm/spi.c
b/test/dm/spi.c
index 61b5b2548c42e4e9895ef95345b5e9e99bc9c52a..2e27da72d505c6afe2df467c0f89fad1ad08c4a5 100644
(file)
--- a/
test/dm/spi.c
+++ b/
test/dm/spi.c
@@
-9,15
+9,15
@@
#include <fdtdec.h>
#include <spi.h>
#include <spi_flash.h>
#include <fdtdec.h>
#include <spi.h>
#include <spi_flash.h>
+#include <asm/state.h>
#include <dm/device-internal.h>
#include <dm/test.h>
#include <dm/uclass-internal.h>
#include <dm/device-internal.h>
#include <dm/test.h>
#include <dm/uclass-internal.h>
-#include <dm/ut.h>
#include <dm/util.h>
#include <dm/util.h>
-#include <
asm/state
.h>
+#include <
test/ut
.h>
/* Test that we can find buses and chip-selects */
/* Test that we can find buses and chip-selects */
-static int dm_test_spi_find(struct
dm_test_state *dm
s)
+static int dm_test_spi_find(struct
unit_test_state *ut
s)
{
struct sandbox_state *state = state_get_current();
struct spi_slave *slave;
{
struct sandbox_state *state = state_get_current();
struct spi_slave *slave;
@@
-36,7
+36,6
@@
static int dm_test_spi_find(struct dm_test_state *dms)
ut_asserteq(0, uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus));
ut_assertok(spi_cs_info(bus, cs, &info));
of_offset = info.dev->of_offset;
ut_asserteq(0, uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus));
ut_assertok(spi_cs_info(bus, cs, &info));
of_offset = info.dev->of_offset;
- sandbox_sf_unbind_emul(state_get_current(), busnum, cs);
device_remove(info.dev);
device_unbind(info.dev);
device_remove(info.dev);
device_unbind(info.dev);
@@
-45,7
+44,7
@@
static int dm_test_spi_find(struct dm_test_state *dms)
* reports that CS 0 is present
*/
ut_assertok(spi_cs_info(bus, cs, &info));
* reports that CS 0 is present
*/
ut_assertok(spi_cs_info(bus, cs, &info));
- ut_asserteq_ptr(
info.dev, NULL
);
+ ut_asserteq_ptr(
NULL, info.dev
);
/* This finds nothing because we removed the device */
ut_asserteq(-ENODEV, spi_find_bus_and_cs(busnum, cs, &bus, &dev));
/* This finds nothing because we removed the device */
ut_asserteq(-ENODEV, spi_find_bus_and_cs(busnum, cs, &bus, &dev));
@@
-62,8
+61,9
@@
static int dm_test_spi_find(struct dm_test_state *dms)
ut_asserteq(-ENOENT, spi_get_bus_and_cs(busnum, cs, speed, mode,
"spi_flash_std", "name", &bus,
&slave));
ut_asserteq(-ENOENT, spi_get_bus_and_cs(busnum, cs, speed, mode,
"spi_flash_std", "name", &bus,
&slave));
+ sandbox_sf_unbind_emul(state_get_current(), busnum, cs);
ut_assertok(spi_cs_info(bus, cs, &info));
ut_assertok(spi_cs_info(bus, cs, &info));
- ut_asserteq_ptr(
info.dev, NULL
);
+ ut_asserteq_ptr(
NULL, info.dev
);
/* Add the emulation and try again */
ut_assertok(sandbox_sf_bind_emul(state, busnum, cs, bus, of_offset,
/* Add the emulation and try again */
ut_assertok(sandbox_sf_bind_emul(state, busnum, cs, bus, of_offset,
@@
-95,7
+95,7
@@
static int dm_test_spi_find(struct dm_test_state *dms)
DM_TEST(dm_test_spi_find, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
/* Test that sandbox SPI works correctly */
DM_TEST(dm_test_spi_find, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
/* Test that sandbox SPI works correctly */
-static int dm_test_spi_xfer(struct
dm_test_state *dm
s)
+static int dm_test_spi_xfer(struct
unit_test_state *ut
s)
{
struct spi_slave *slave;
struct udevice *bus;
{
struct spi_slave *slave;
struct udevice *bus;