<div class="gmail_quote">2009/12/24 Carl-Daniel Hailfinger <span dir="ltr"><<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>></span><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
internal.c was always compiled in because it hosted the function<br>
internal_delay(). Move that function to udelay.c and compile internal.c<br>
only if really needed.<br>
physmap.c is only needed if the programmer is internal or a PCI card.<br>
Make its compilation conditional.<br>
<br>
Signed-off-by: Carl-Daniel Hailfinger <<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>><br>
<br>
Index: flashrom-programmer_internal_refactor_delay/flash.h<br>
===================================================================<br>
--- flashrom-programmer_internal_refactor_delay/flash.h (Revision 821)<br>
+++ flashrom-programmer_internal_refactor_delay/flash.h (Arbeitskopie)<br>
@@ -277,6 +277,7 @@<br>
/* udelay.c */<br>
void myusec_delay(int usecs);<br>
void myusec_calibrate_delay(void);<br>
+void internal_delay(int usecs);<br>
<br>
#if NEED_PCI == 1<br>
/* pcidev.c */<br>
@@ -365,7 +366,6 @@<br>
uint8_t mmio_readb(void *addr);<br>
uint16_t mmio_readw(void *addr);<br>
uint32_t mmio_readl(void *addr);<br>
-void internal_delay(int usecs);<br>
int noop_shutdown(void);<br>
void *fallback_map(const char *descr, unsigned long phys_addr, size_t len);<br>
void fallback_unmap(void *virt_addr, size_t len);<br>
Index: flashrom-programmer_internal_refactor_delay/Makefile<br>
===================================================================<br>
--- flashrom-programmer_internal_refactor_delay/Makefile (Revision 821)<br>
+++ flashrom-programmer_internal_refactor_delay/Makefile (Arbeitskopie)<br>
@@ -47,7 +47,7 @@<br>
sst28sf040.o am29f040b.o mx29f002.o m29f400bt.o pm29f002.o w39v040c.o \<br>
w49f002u.o 82802ab.o pm49fl00x.o sst49lf040.o en29f002a.o m29f002.o \<br>
sst49lfxxxc.o sst_fwhub.o flashchips.o layout.o spi.o \<br>
- flashrom.o print.o physmap.o internal.o udelay.o<br>
+ flashrom.o print.o udelay.o<br>
<br>
all: pciutils features dep $(PROGRAM)<br>
<br>
@@ -168,7 +168,7 @@<br>
<br>
ifeq ($(NEED_PCI), yes)<br>
FEATURE_CFLAGS += -D'NEED_PCI=1'<br>
-OBJS += pcidev.o<br>
+OBJS += pcidev.o physmap.o internal.o<br>
endif<br>
<br>
ifeq ($(CONFIG_PRINT_WIKI), yes)<br>
Index: flashrom-programmer_internal_refactor_delay/internal.c<br>
===================================================================<br>
--- flashrom-programmer_internal_refactor_delay/internal.c (Revision 821)<br>
+++ flashrom-programmer_internal_refactor_delay/internal.c (Arbeitskopie)<br>
@@ -248,18 +248,6 @@<br>
return *(volatile uint32_t *) addr;<br>
}<br>
<br>
-void internal_delay(int usecs)<br>
-{<br>
- /* If the delay is >1 s, use usleep because timing does not need to<br>
- * be so precise.<br>
- */<br>
- if (usecs > 1000000) {<br>
- usleep(usecs);<br>
- } else {<br>
- myusec_delay(usecs);<br>
- }<br>
-}<br>
-<br>
/* No-op shutdown() for programmers which don't need special handling */<br>
int noop_shutdown(void)<br>
{<br>
Index: flashrom-programmer_internal_refactor_delay/udelay.c<br>
===================================================================<br>
--- flashrom-programmer_internal_refactor_delay/udelay.c (Revision 821)<br>
+++ flashrom-programmer_internal_refactor_delay/udelay.c (Arbeitskopie)<br>
@@ -63,3 +63,16 @@<br>
(unsigned long)micro, timeusec);<br>
printf("OK.\n");<br>
}<br>
+<br>
+void internal_delay(int usecs)<br>
+{<br>
+ /* If the delay is >1 s, use usleep because timing does not need to<br>
+ * be so precise.<br>
+ */<br>
+ if (usecs > 1000000) {<br>
+ usleep(usecs);<br>
+ } else {<br>
+ myusec_delay(usecs);<br>
+ }<br>
+}<br>
+<br>
<br>
<br>
--<br>
Developer quote of the year:<br>
"We are juggling too many chainsaws and flaming arrows and tigers."<br>
<br>
<br>
_______________________________________________<br>
flashrom mailing list<br>
<a href="mailto:flashrom@flashrom.org">flashrom@flashrom.org</a><br>
<a href="http://www.flashrom.org/mailman/listinfo/flashrom" target="_blank">http://www.flashrom.org/mailman/listinfo/flashrom</a><br>
</blockquote></div><br><span class="il">Acked</span>-by: Idwer Vollering <vidwer<a href="mailto:audiohacked@gmail.com" target="_blank">@gmail.com</a>><br>