Fix build for GNU/kFreeBSD, fix FreeBSD

default serial port name.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@925 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2010-01-17 16:58:06 +00:00
parent 224954d8ce
commit a8d23ba1e8
4 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2010-01-15 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Aurelien Jarno:
* configure.ac: Fix build for GNU/kFreeBSD, fix FreeBSD
default serial port name.
* ppi.c: Fix build for GNU/kFreeBSD.
* par.c: (Dito.)
2010-01-15 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2010-01-15 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* configure.ac: Bump version for post-5.8. * configure.ac: Bump version for post-5.8.

View File

@ -196,11 +196,11 @@ case $target in
DEFAULT_PAR_PORT="unknown" DEFAULT_PAR_PORT="unknown"
DEFAULT_SER_PORT="/dev/ttyS0" DEFAULT_SER_PORT="/dev/ttyS0"
;; ;;
i[[3456]]86-*-freebsd*|amd64-*-freebsd*) i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
DEFAULT_PAR_PORT="/dev/ppi0" DEFAULT_PAR_PORT="/dev/ppi0"
DEFAULT_SER_PORT="/dev/cuaa0" DEFAULT_SER_PORT="/dev/cuaa0"
;; ;;
*-*-freebsd*) *-*-*freebsd*)
DEFAULT_PAR_PORT="unknown" DEFAULT_PAR_PORT="unknown"
DEFAULT_SER_PORT="/dev/cuaa0" DEFAULT_SER_PORT="/dev/cuaa0"
;; ;;

2
par.c
View File

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include "freebsd_ppi.h" # include "freebsd_ppi.h"
#elif defined(__linux__) #elif defined(__linux__)
# include "linux_ppdev.h" # include "linux_ppdev.h"

2
ppi.c
View File

@ -33,7 +33,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include "freebsd_ppi.h" # include "freebsd_ppi.h"
#elif defined(__linux__) #elif defined(__linux__)
# include "linux_ppdev.h" # include "linux_ppdev.h"