Commit: 705d5edabb0e4137dc76247bbb390e546136e7c7 - h8flash (git)

Commit MetaInfo

• Revisión: 705d5edabb0e4137dc76247bbb390e546136e7c7 (tree)
• Tiempo: 2014-02-18 17:55:02
• Autor: Yoshinori Sato <ysato@sa76...>
• Commiter: Yoshinori Sato

Log Message

autotools

Cambiar Resumen

• add: AUTHORS
• add: ChangeLog
• delete: Makefile
• add: Makefile.am
• modified: README
• add: compile
• add: config.h.in
• add: configure.ac
• modified: main.c
• modified: usb.c

Diferencia incremental

--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Yoshinori Sato <[e-mail]>

--- a/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-CC = gcc
-CFLAGS = -Wall -O2 -g
-OBJS = main.o comm.o serial.o usb.o
-TARGET= h8flash
-
-all: h8flash
-
-$(TARGET): $(OBJS)
-	$(CC) -o $(TARGET) $(OBJS) -lusb
-
-main.o: main.c h8flash.h
-
-comm.o: comm.c h8flash.h
-
-serial.o: serial.c h8flash.h
-
-usb.o: usb.c
-
-.phony: clean
-
-clean:
-	rm -f *.o *~ $(TARGET)

--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS = h8flash
+h8flash_SOURCES = main.c comm.c serial.c usb.c
+h8flash_LDADD = $(LIBOBJS)

--- a/README
+++ b/README
@@ -2,13 +2,16 @@ Renesas CPU on-chip flash memory writer
 
 1. Requirement
 - Standard POSIX library
-- libusb
+- libusb (optional)
+- libelf (optional)
 
 2. Build and Install
-please run "make".
+ 1. ./configure
+ 2. make
+ 3. make install
 
 3. Usage
-h8flash [-p port] [-f freq] [-b] [-l] [-V] filename
+h8flash -f freq[-p port] [-b] [-l] [-V] filename
 -p
 	commnunication port setting. 
 	'usb' is using usb. others using serial port.
@@ -27,7 +30,7 @@ h8flash [-p port] [-f freq] [-b] [-l] [-V] filename
 	verbose mode
 
 filename
-	S-Record file or binary image.
+	S-Record file, ELF binary or raw binary image.
 
 4. Licenses
-This program license is GPL v3 or later.
+This program license is GPL v2.1 or later.

--- /dev/null
+++ b/compile
@@ -0,0 +1 @@
+/usr/share/automake-1.14/compile
\ No newline at end of file

--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,103 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `ftruncate' function. */
+#undef HAVE_FTRUNCATE
+
+/* Define to 1 if you have the <gelf.h> header file. */
+#undef HAVE_GELF_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `malloc' function. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `munmap' function. */
+#undef HAVE_MUNMAP
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <termios.h> header file. */
+#undef HAVE_TERMIOS_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <usb.h> header file. */
+#undef HAVE_USB_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t

--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,51 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([h8flash], [2.00], [[e-mail]])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([usb.c])
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+
+# Checks for libraries.
+AC_CHECK_LIB(usb, usb_bulk_write,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_bulk_read,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_init,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_get_busses,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_find_devices,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_get_busses,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_open,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_strerr,has_usb=1,has_usb=0)
+AC_CHECK_LIB(usb, usb_claim_interface,has_usb=1,has_usb=0)
+AC_CHECK_LIB(elf, elf_version,has_elf=1,has_elf=0)
+AC_CHECK_LIB(elf, elf_begin,has_elf=1,has_elf=0)
+AC_CHECK_LIB(elf, elf_kind,has_elf=1,has_elf=0)
+AC_CHECK_LIB(elf, elf_getphdrnum,has_elf=1,has_elf=0)
+AC_CHECK_LIB(elf, gelf_getphdr,has_elf=1,has_elf=0)
+AC_CHECK_LIB(elf, elf_end,has_elf=1,has_elf=0)
+if test $has_usb = 0; then
+   AC_MSG_WARN("WARNING: can not found libusb.")
+   AC_MSG_WARN("disabled usb functions');
+else
+   LIBS="-lusb"
+fi
+if test $has_elf = 0; then
+   AC_MSG_WARN("WARNING: can not found libelf.")
+   AC_MSG_WARN("disabled elf handle.');
+else
+   LIBS="$LIBS -lelf"
+fi
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/time.h termios.h unistd.h usb.h gelf.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_PID_T
+
+# Checks for library functions.
+AC_CHECK_FUNCS([ftruncate memchr memset munmap select strncasecmp strtoul malloc mmap])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

--- a/main.c
+++ b/main.c
@@ -8,6 +8,10 @@
  * General Public License version 2.1 (or later).
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <getopt.h>
 #include <stddef.h>
@@ -403,12 +407,13 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (optind >= argc && !config_list) {
+	if (optind >= argc || !config_list || input_freq == 0) {
 		usage();
 		return 1;
 	}
 
 	r = 1;
+#ifdef HAVE_USB_H
 	if (strncasecmp(port, "usb", 3) == 0) {
 		unsigned short vid = DEFAULT_VID;
 		unsigned short pid = DEFAULT_PID;
@@ -421,6 +426,9 @@ int main(int argc, char *argv[])
 		p = open_usb(vid, pid);
 	} else
 		p = open_serial(port);
+#else
+	p = open_serial(port);
+#endif
 	if (p == NULL)
 		goto error;
 

--- a/usb.c
+++ b/usb.c
@@ -8,8 +8,13 @@
  * General Public License version 2.1 (or later).
  */
 
-#include <usb.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_USB_H
+#include <usb.h>
 #include "h8flash.h"
 
 #define USB_TIMEOUT 100000
@@ -118,3 +123,9 @@ found:
 	snprintf(target, sizeof(target), "USB(%04x:%04x)", vid, pid);
 	return &usb_port;
 }
+#else
+struct port_t *open_usb(unsigned short vid, unsigned short pid)
+{
+	return NULL;
+}
+#endif