Changeset 54
- Timestamp:
- 04/05/09 03:24:04 (15 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r45 r54 1 1 SHELL = /bin/sh 2 2 3 3 VER = $(subst ",,$(filter-out \#define CS_VERSION,$(shell grep CS_VERSION globals.h))) … … 9 9 win: cross-i386-pc-cygwin 10 10 cygwin: i386-pc-cygwin 11 macosx: macosx-native 11 12 12 13 std: linux \ 14 macosx \ 13 15 cross-i386-pc-cygwin \ 14 16 cross-powerpc-tuxbox-linux \ … … 68 70 ###################################################################### 69 71 # 72 # MacOSX native 73 # 74 ###################################################################### 75 macosx-native: 76 @-$(MAKE) --no-print-directory \ 77 -f Maketype TYP=$(subst cross-,,$@) \ 78 OS_LIBS="-lcrypto" \ 79 OS_CULI="-lncurses" \ 80 OS_PTLI="-lpthread" \ 81 DS_OPTS="-O2 -DOS_MACOSX" \ 82 DS_CFLAGS="-c" \ 83 DS_LDFLAGS="" \ 84 DS_ARFLAGS="-rvsl" \ 85 DS_CC=gcc \ 86 DS_AR=ar \ 87 DS_LD=ld \ 88 DS_RL=ranlib \ 89 DS_ST=strip 90 91 92 ###################################################################### 93 # 70 94 # FreeBSD native 71 95 # -
trunk/csctapi/io_serial.c
r45 r54 46 46 #include "mc_global.h" 47 47 48 #if ndef OS_CYGWIN3248 #ifdef OS_LINUX 49 49 #include <linux/serial.h> 50 50 #endif … … 515 515 cfsetispeed(&newtio, IO_Serial_Bitrate(props->input_bitrate)); 516 516 } else { 517 #if ndef OS_CYGWIN32517 #ifdef OS_LINUX 518 518 struct serial_struct nuts; 519 519 ioctl(io->fd, TIOCGSERIAL, &nuts); … … 525 525 cfsetispeed(&newtio, IO_Serial_Bitrate(38400)); 526 526 #else 527 cfsetospeed(&newtio, IO_Serial_Bitrate(9600 / 3.57 * 6));528 cfsetispeed(&newtio, IO_Serial_Bitrate(9600 / 3.57 * 6));527 cfsetospeed(&newtio, IO_Serial_Bitrate(props->output_bitrate)); 528 cfsetispeed(&newtio, IO_Serial_Bitrate(props->input_bitrate)); 529 529 #endif 530 530 } … … 532 532 /* for 3.57 MHz */ 533 533 if (reader_irdeto_mode) { 534 #if ndef OS_CYGWIN32534 #ifdef OS_LINUX 535 535 struct serial_struct nuts; 536 536 ioctl(io->fd, TIOCGSERIAL, &nuts); … … 542 542 cfsetispeed(&newtio, IO_Serial_Bitrate(38400)); 543 543 #else 544 cfsetospeed(&newtio, IO_Serial_Bitrate(5713));545 cfsetispeed(&newtio, IO_Serial_Bitrate(5713));544 cfsetospeed(&newtio, IO_Serial_Bitrate(props->output_bitrate)); 545 cfsetispeed(&newtio, IO_Serial_Bitrate(props->input_bitrate)); 546 546 #endif 547 547 } else { -
trunk/oscam-types.h
r21 r54 8 8 //typedef unsigned short ushort; 9 9 10 #if defined(OS_CYGWIN32) || defined(OS_HPUX) || defined(OS_FREEBSD) 10 #if defined(OS_CYGWIN32) || defined(OS_HPUX) || defined(OS_FREEBSD) || defined(OS_MACOSX) 11 11 typedef unsigned long ulong; 12 12 #endif … … 17 17 18 18 #ifndef NO_ENDIAN_H 19 #include <endian.h> 20 #include <byteswap.h> 19 #ifdef OS_MACOSX 20 #include <machine/endian.h> 21 #else 22 #include <endian.h> 23 #include <byteswap.h> 24 #endif 21 25 #endif 22 26 -
trunk/reader-videoguard2.c
r45 r54 4 4 #include <termios.h> 5 5 #include <unistd.h> 6 #if ndef OS_CYGWIN326 #ifdef OS_LINUX 7 7 #include <linux/serial.h> 8 8 #endif … … 475 475 } 476 476 477 #if ndef OS_CYGWIN32477 #ifdef OS_LINUX 478 478 int bconst=B38400; 479 479 int baud=64516;
Note:
See TracChangeset
for help on using the changeset viewer.