1 files changed, 33 insertions, 5 deletions

diff --git a/gammu/emb/common/device/serial/ser_unx.c b/gammu/emb/common/device/serial/ser_unx.c
index 2a87b11..69c7515 100644
--- a/gammu/emb/common/device/serial/ser_unx.c
+++ b/gammu/emb/common/device/serial/ser_unx.c
@@ -1,8 +1,12 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 /* locking device and settings all speeds by Michal Cihar */
+/* based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_SERIALDEVICE
 #ifndef WIN32
 #ifndef DJGPP
@@ -13,12 +17,36 @@
 #include <termios.h>
 #include <errno.h>
 
 #include "../../gsmcomon.h"
 #include "ser_unx.h"
 
+#ifndef O_NONBLOCK
+#  define O_NONBLOCK  0
+#endif
+
+#ifdef __NetBSD__
+#  define FNONBLOCK O_NONBLOCK
+
+#  define  B57600   0010001
+#  define  B115200  0010002
+#  define  B230400  0010003
+#  define  B460800  0010004
+#  define  B500000  0010005
+#  define  B576000  0010006
+#  define  B921600  0010007
+#  define  B1000000 0010010
+#  define  B1152000 0010011
+#  define  B1500000 0010012
+#  define  B2000000 0010013
+#  define  B2500000 0010014
+#  define  B3000000 0010015
+#  define  B3500000 0010016
+#  define  B4000000 0010017
+#endif
+
 static GSM_Error serial_close(GSM_StateMachine *s)
 {
         GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
         /* Restores old settings */
         tcsetattr(d->hPhone, TCSANOW, &d->old_settings);
@@ -26,16 +54,12 @@ static GSM_Error serial_close(GSM_StateMachine *s)
         /* Closes device */
         close(d->hPhone);
 
         return ERR_NONE;
 }
 
-#ifndef O_NONBLOCK
-#  define O_NONBLOCK  0
-#endif
-
 static GSM_Error serial_open (GSM_StateMachine *s)
 {
         GSM_Device_SerialData   *d = &s->Device.Data.Serial;
                 struct termios  t;
                 int                 i;
 
@@ -174,13 +198,13 @@ static GSM_Error serial_setdtrrts(GSM_StateMachine *s, bool dtr, bool rts)
 }
 
 static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed)
 {
                 GSM_Device_SerialData *d = &s->Device.Data.Serial;
                 struct termios  t;
-                int          speed2 = B19200;
+                int             speed2 = B19200;
 
             if (tcgetattr(d->hPhone, &t)) {
                 GSM_OSErrorInfo(s,"tcgetattr in serial_setspeed");
                 return ERR_DEVICEREADERROR;
             }
 
@@ -199,27 +223,31 @@ static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed)
                         case 1800:      speed2 = B1800;         break;
                         case 2400:      speed2 = B2400;         break;
                         case 4800:      speed2 = B4800;         break;
                         case 9600:      speed2 = B9600;         break;
                         case 19200:     speed2 = B19200;break;
                         case 38400:     speed2 = B38400;break;
+#ifdef B57600
                         case 57600:     speed2 = B57600;break;
                         case 115200:    speed2 = B115200;break;
                         case 230400:    speed2 = B230400;break;
                         case 460800:    speed2 = B460800;break;
+#ifdef B500000
                         case 500000:    speed2 = B500000;break;
                         case 576000:    speed2 = B576000;break;
                         case 921600:    speed2 = B921600;break;
                         case 1000000:   speed2 = B1000000;break;
                         case 1152000:   speed2 = B1152000;break;
                         case 1500000:   speed2 = B1500000;break;
                         case 2000000:   speed2 = B2000000;break;
                         case 2500000:   speed2 = B2500000;break;
                         case 3000000:   speed2 = B3000000;break;
                         case 3500000:   speed2 = B3500000;break;
                         case 4000000:   speed2 = B4000000;      break;
+#endif
+#endif
         }
 
             /* This should work on all systems because it is done according to POSIX */
             cfsetispeed(&t, speed2);
             cfsetospeed(&t, speed2);