summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-06-15 09:16:20 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:39:26 -0700
commit627a13e40953cea97cdac0f4e0ccaae05f7dca3c (patch)
tree6ea55ab65983bd34aeb73062ca5f2b9784a3145b /include
parent09046f774a4d5eafb30e0bf27296c7afcb31ba0a (diff)
CHROMIUM: [3/7] fix to merely compilable; add mmc initializer and remove obsolete mmc and usb codes
This is the third of the seven commits in the series. For more information, please refer to the first commit. Changes in this commit: * implement mmc device initializer for new mmc driver * remove obsolete mmc and usb probing codes BUG=chromium-os:16508 TEST=manual; see the first commit Change-Id: I40430a7bdc676fdddb473a09f2de3681fd250cb3 Reviewed-on: http://gerrit.chromium.org/gerrit/2701 Tested-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/chromeos/os_storage.h4
-rw-r--r--include/mmc.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/chromeos/os_storage.h b/include/chromeos/os_storage.h
index ad9104aef8f..b027ea24735 100644
--- a/include/chromeos/os_storage.h
+++ b/include/chromeos/os_storage.h
@@ -37,9 +37,11 @@ ulong get_limit(void);
uint64_t get_bytes_per_lba(void);
uint64_t get_ending_lba(void);
+int initialize_mmc_device(int dev);
+
/* Probe whether external storage device presents */
int is_mmc_storage_present(int mmc_device_number);
-int is_usb_storage_present(int usb_controller_number);
+int is_usb_storage_present(void);
/*
* When BOOT_PROBED_DEVICE is passed to is_any_storage_device_plugged(), the
diff --git a/include/mmc.h b/include/mmc.h
index 6891613ea98..4701e2482f5 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -313,8 +313,6 @@ int atmel_mci_init(void *regs);
struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
#else
int mmc_legacy_init(int verbose);
-/* TODO: temporary hack for factory bring up; remove/rewrite when necessary */
-int get_mmc_current_device(void);
#endif
#endif /* _MMC_H_ */