Teach abuild to emit JUnit formatted build reports

[coreboot.git] / util / msrtool / msrtool.h

diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index c2cd6cb3a81fe625c5cd4cbf9e4f755c2649bc01..0441e3f1d48966649df139313889b4ea6ada408d 100644 (file)
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include <stdint.h>
 #if (defined(__MACH__) && defined(__APPLE__))
-/* DirectIO is available here: http://www.coresystems.de/en/directio */
+/* DirectHW is available here: http://www.coreboot.org/DirectHW */
 #define __DARWIN__
-#include <DirectIO/darwinio.h>
+#include <DirectHW/DirectHW.h>
 #endif
 #if defined(__FreeBSD__)
 #include <sys/ioctl.h>
@@ -170,7 +170,7 @@ const struct msrdef *findmsrdef(const uint32_t addr);
 uint32_t msraddrbyname(const char *name);
 void dumpmsrdefs(const struct targetdef *t);
 int dumpmsrdefsvals(FILE *f, const struct targetdef *t, const uint8_t cpu);
-uint8_t str2msr(char *str, struct msr *msr);
+uint8_t str2msr(char *str, struct msr *msr, char **endptr);
 void decodemsr(const uint8_t cpu, const uint32_t addr, const struct msr val);
 uint8_t diff_msr(FILE *fout, const uint32_t addr, const struct msr a, const struct msr b);
 
@@ -198,6 +198,10 @@ extern int freebsd_rdmsr(uint8_t cpu, uint32_t addr, struct msr *val);
 
 /** target externs **/
 
+/* geodegx2.c */
+extern int geodegx2_probe(const struct targetdef *t);
+extern const struct msrdef geodegx2_msrs[];
+
 /* geodelx.c */
 extern int geodelx_probe(const struct targetdef *t);
 extern const struct msrdef geodelx_msrs[];