summaryrefslogtreecommitdiff
path: root/satasii.c
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2011-12-18 15:01:24 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2011-12-18 15:01:24 +0000
commite8c818e1cd78e69a3cb2ad9785a48a858f34415c (patch)
tree3a5514d022392cf4d8fa368f9f02653da21a93ca /satasii.c
parentbaf84624cd340c9b8dfaa45c56060ab788f4945e (diff)
downloadflashrom-e8c818e1cd78e69a3cb2ad9785a48a858f34415c.tar.gz
Add struct flashctx * parameter to all functions accessing flash chips.
All programmer access function prototypes except init have been made static and moved to the respective file. A few internal functions in flash chip drivers had chipaddr parameters which are no longer needed. The lines touched by flashctx changes have been adjusted to 80 columns except in header files. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1474 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'satasii.c')
-rw-r--r--satasii.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/satasii.c b/satasii.c
index e51e3ae..387c605 100644
--- a/satasii.c
+++ b/satasii.c
@@ -42,6 +42,10 @@ const struct pcidev_status satas_sii[] = {
{},
};
+static void satasii_chip_writeb(const struct flashctx *flash, uint8_t val,
+ chipaddr addr);
+static uint8_t satasii_chip_readb(const struct flashctx *flash,
+ const chipaddr addr);
static const struct par_programmer par_programmer_satasii = {
.chip_readb = satasii_chip_readb,
.chip_readw = fallback_chip_readw,
@@ -95,7 +99,8 @@ int satasii_init(void)
return 0;
}
-void satasii_chip_writeb(uint8_t val, chipaddr addr)
+static void satasii_chip_writeb(const struct flashctx *flash, uint8_t val,
+ chipaddr addr)
{
uint32_t ctrl_reg, data_reg;
@@ -112,7 +117,8 @@ void satasii_chip_writeb(uint8_t val, chipaddr addr)
while (pci_mmio_readl(sii_bar) & (1 << 25)) ;
}
-uint8_t satasii_chip_readb(const chipaddr addr)
+static uint8_t satasii_chip_readb(const struct flashctx *flash,
+ const chipaddr addr)
{
uint32_t ctrl_reg;