aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbang_spi.c6
-rw-r--r--developerbox_spi.c2
-rw-r--r--mcp6x_spi.c2
-rw-r--r--nicintel_spi.c2
-rw-r--r--ogp_spi.c2
-rw-r--r--pony_spi.c2
-rw-r--r--programmer.h2
-rw-r--r--rayer_spi.c2
8 files changed, 12 insertions, 8 deletions
diff --git a/bitbang_spi.c b/bitbang_spi.c
index e70d883e..e595b16f 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -96,6 +96,7 @@ static void bitbang_spi_write_byte(const struct bitbang_spi_master *master, uint
struct bitbang_spi_master_data {
const struct bitbang_spi_master *master;
+ void *spi_data;
};
static int bitbang_spi_send_command(const struct flashctx *flash,
@@ -146,7 +147,7 @@ static int bitbang_spi_shutdown(void *data)
return 0;
}
-int register_spi_bitbang_master(const struct bitbang_spi_master *master)
+int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data)
{
struct spi_master mst = spi_master_bitbang;
/* If someone forgot to initialize a bitbang function, we catch it here. */
@@ -161,6 +162,9 @@ int register_spi_bitbang_master(const struct bitbang_spi_master *master)
struct bitbang_spi_master_data *data = calloc(1, sizeof(struct bitbang_spi_master_data));
data->master = master;
+ if (spi_data)
+ data->spi_data = spi_data;
+
register_spi_master(&mst, data);
register_shutdown(bitbang_spi_shutdown, data);
diff --git a/developerbox_spi.c b/developerbox_spi.c
index 4ff2fb60..4ccfaaaf 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -158,7 +158,7 @@ int developerbox_spi_init(void)
if (register_shutdown(developerbox_spi_shutdown, NULL))
goto err_exit;
- if (register_spi_bitbang_master(&bitbang_spi_master_cp210x))
+ if (register_spi_bitbang_master(&bitbang_spi_master_cp210x, NULL))
goto err_exit;
return 0;
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
index b53d07bd..543142bb 100644
--- a/mcp6x_spi.c
+++ b/mcp6x_spi.c
@@ -151,7 +151,7 @@ int mcp6x_spi_init(int want_spi)
(status >> MCP6X_SPI_GRANT) & 0x1);
mcp_gpiostate = status & 0xff;
- if (register_spi_bitbang_master(&bitbang_spi_master_mcp6x)) {
+ if (register_spi_bitbang_master(&bitbang_spi_master_mcp6x, NULL)) {
/* This should never happen. */
msg_perr("MCP6X bitbang SPI master init failed!\n");
return 1;
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 1173ef77..03df8efc 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -273,7 +273,7 @@ int nicintel_spi_init(void)
return 1;
}
- if (register_spi_bitbang_master(&bitbang_spi_master_nicintel))
+ if (register_spi_bitbang_master(&bitbang_spi_master_nicintel, NULL))
return 1;
return 0;
diff --git a/ogp_spi.c b/ogp_spi.c
index e603edb8..7a228090 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -135,7 +135,7 @@ int ogp_spi_init(void)
if (ogp_spibar == ERROR_PTR)
return 1;
- if (register_spi_bitbang_master(&bitbang_spi_master_ogp))
+ if (register_spi_bitbang_master(&bitbang_spi_master_ogp, NULL))
return 1;
return 0;
diff --git a/pony_spi.c b/pony_spi.c
index ed9d326c..9e00b030 100644
--- a/pony_spi.c
+++ b/pony_spi.c
@@ -224,7 +224,7 @@ int pony_spi_init(void)
return 1;
}
- if (register_spi_bitbang_master(&bitbang_spi_master_pony)) {
+ if (register_spi_bitbang_master(&bitbang_spi_master_pony, NULL)) {
return 1;
}
return 0;
diff --git a/programmer.h b/programmer.h
index 790fcc84..1874612d 100644
--- a/programmer.h
+++ b/programmer.h
@@ -542,7 +542,7 @@ int pony_spi_init(void);
#endif
/* bitbang_spi.c */
-int register_spi_bitbang_master(const struct bitbang_spi_master *master);
+int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data);
/* buspirate_spi.c */
#if CONFIG_BUSPIRATE_SPI == 1
diff --git a/rayer_spi.c b/rayer_spi.c
index cde008f7..7b518c9e 100644
--- a/rayer_spi.c
+++ b/rayer_spi.c
@@ -265,7 +265,7 @@ int rayer_spi_init(void)
if (pinout->preinit)
pinout->preinit(pinout);
- if (register_spi_bitbang_master(&bitbang_spi_master_rayer))
+ if (register_spi_bitbang_master(&bitbang_spi_master_rayer, NULL))
return 1;
return 0;
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441