gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[serial] detriplicate (!) ttybuf initialization

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-05-20 18:26:58 +02:00
parent 3090b38a46
commit f395d805ff
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 11 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/emu_serial.c
View file

@ -184,84 +184,42 @@ void serial_baud( int baud )
} }
} }
#if defined( __APPLE__ ) #if !defined( __APPLE__ )
baud &= 0x7;
switch ( baud ) {
case 0: /* 1200 */
ttybuf.c_cflag |= B1200;
break;
case 1: /* 1920 */
# ifdef B1920
ttybuf.c_cflag |= B1920;
# endif
break;
case 2: /* 2400 */
ttybuf.c_cflag |= B2400;
break;
case 3: /* 3840 */
# ifdef B3840
ttybuf.c_cflag |= B3840;
# endif
break;
case 4: /* 4800 */
ttybuf.c_cflag |= B4800;
break;
case 5: /* 7680 */
# ifdef B7680
ttybuf.c_cflag |= B7680;
# endif
break;
case 6: /* 9600 */
ttybuf.c_cflag |= B9600;
break;
case 7: /* 15360 */
# ifdef B15360
ttybuf.c_cflag |= B15360;
# endif
break;
}
if ( ( ir_fd >= 0 ) && ( ( ttybuf.c_ospeed ) == 0 ) ) {
if ( config.verbose )
fprintf( stderr, "can\'t set baud rate, using 9600\n" );
ttybuf.c_cflag |= B9600;
}
#else
ttybuf.c_cflag &= ~CBAUD; ttybuf.c_cflag &= ~CBAUD;
#endif
baud &= 0x7; baud &= 0x7;
switch ( baud ) { switch ( baud ) {
case 0: /* 1200 */ case 0: /* 1200 */
ttybuf.c_cflag |= B1200; ttybuf.c_cflag |= B1200;
break; break;
case 1: /* 1920 */ case 1: /* 1920 */
# ifdef B1920 #ifdef B1920
ttybuf.c_cflag |= B1920; ttybuf.c_cflag |= B1920;
# endif #endif
break; break;
case 2: /* 2400 */ case 2: /* 2400 */
ttybuf.c_cflag |= B2400; ttybuf.c_cflag |= B2400;
break; break;
case 3: /* 3840 */ case 3: /* 3840 */
# ifdef B3840 #ifdef B3840
ttybuf.c_cflag |= B3840; ttybuf.c_cflag |= B3840;
# endif #endif
break; break;
case 4: /* 4800 */ case 4: /* 4800 */
ttybuf.c_cflag |= B4800; ttybuf.c_cflag |= B4800;
break; break;
case 5: /* 7680 */ case 5: /* 7680 */
# ifdef B7680 #ifdef B7680
ttybuf.c_cflag |= B7680; ttybuf.c_cflag |= B7680;
# endif #endif
break; break;
case 6: /* 9600 */ case 6: /* 9600 */
ttybuf.c_cflag |= B9600; ttybuf.c_cflag |= B9600;
break; break;
case 7: /* 15360 */ case 7: /* 15360 */
# ifdef B15360 #ifdef B15360
ttybuf.c_cflag |= B15360; ttybuf.c_cflag |= B15360;
# endif #endif
break; break;
} }
@ -271,7 +229,7 @@ void serial_baud( int baud )
ttybuf.c_cflag |= B9600; ttybuf.c_cflag |= B9600;
} }
#endif
if ( ir_fd >= 0 ) { if ( ir_fd >= 0 ) {
#if defined( TCSANOW ) #if defined( TCSANOW )
if ( tcsetattr( ir_fd, TCSANOW, &ttybuf ) < 0 ) if ( tcsetattr( ir_fd, TCSANOW, &ttybuf ) < 0 )
@ -303,68 +261,6 @@ void serial_baud( int baud )
} }
} }
#if defined( __APPLE__ )
#else
ttybuf.c_cflag &= ~CBAUD;
baud &= 0x7;
switch ( baud ) {
case 0: /* 1200 */
ttybuf.c_cflag |= B1200;
break;
case 1: /* 1920 */
# ifdef B1920
ttybuf.c_cflag |= B1920;
# endif
break;
case 2: /* 2400 */
ttybuf.c_cflag |= B2400;
break;
case 3: /* 3840 */
# ifdef B3840
ttybuf.c_cflag |= B3840;
# endif
break;
case 4: /* 4800 */
ttybuf.c_cflag |= B4800;
break;
case 5: /* 7680 */
# ifdef B7680
ttybuf.c_cflag |= B7680;
# endif
break;
case 6: /* 9600 */
ttybuf.c_cflag |= B9600;
break;
case 7: /* 15360 */
# ifdef B15360
ttybuf.c_cflag |= B15360;
# endif
break;
}
if ( ( ttyp >= 0 ) && ( ( ttybuf.c_cflag & CBAUD ) == 0 ) ) {
if ( config.verbose )
fprintf( stderr, "can\'t set baud rate, using 9600\n" );
ttybuf.c_cflag |= B9600;
}
#endif
if ( ttyp >= 0 ) {
#if defined( TCSANOW )
if ( tcsetattr( ttyp, TCSANOW, &ttybuf ) < 0 )
#else
if ( ioctl( ttyp, TCSETS, ( char* )&ttybuf ) < 0 )
#endif
{
if ( config.verbose )
fprintf( stderr, "ioctl(wire, TCSETS) failed, errno = %d\n", errno );
wire_fd = -1;
ttyp = -1;
error = 1;
}
}
if ( error ) if ( error )
update_connection_display(); update_connection_display();
} }