# HG changeset patch # User Mychaela Falconia # Date 1502044955 0 # Node ID 8fb920215a46d7e7f4ee8040e8e32e40c8315cb3 # Parent 7e8aa98159ef2c38d4086c1a1707d43e59c19f37 init.c & components/main-init: put RVTMUX on MODEM on C139 like before diff -r 7e8aa98159ef -r 8fb920215a46 components/main-init --- a/components/main-init Sun Aug 06 18:26:20 2017 +0000 +++ b/components/main-init Sun Aug 06 18:42:35 2017 +0000 @@ -5,6 +5,11 @@ CFLAGS="-mn -mt -o -x -mw -me -pw2" CPPFLAGS="-DTOOL_CHOICE=0 -D_TMS470" +if [ "$TARGET" = c139 ] +then + CPPFLAGS="$CPPFLAGS -DCONFIG_RVTMUX_ON_MODEM" +fi + # Includes CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus" diff -r 7e8aa98159ef -r 8fb920215a46 src/cs/system/Main/init.c --- a/src/cs/system/Main/init.c Sun Aug 06 18:26:20 2017 +0000 +++ b/src/cs/system/Main/init.c Sun Aug 06 18:42:35 2017 +0000 @@ -193,19 +193,12 @@ T_AppliSerialInfo appli_ser_cfg_info = #endif /* OP_L1_STANDALONE */ { - #ifdef BTEMOBILE - #ifdef BT_UART_USED_MODEM - {UART_MODEM_BT_HCI, - DUMMY_FAX_DATA, - UART_IRDA_TRACE, - DUMMY_TRACE}, // default config (Bluetooth on Modem) - 0x014A - #else - {UART_IRDA_TRACE, - DUMMY_FAX_DATA, - UART_MODEM_TRACE, - DUMMY_TRACE}, // default config (Bluetooth on IrDa) - 0x0249 - #endif // BT_UART_USED_MODEM - #else // BTEMOBILE + #ifdef CONFIG_RVTMUX_ON_MODEM + {DUMMY_BT_HCI, + DUMMY_FAX_DATA, + UART_MODEM_TRACE, + DUMMY_TRACE}, // 0x0248 + #else // RVTMUX_ON_MODEM {DUMMY_BT_HCI, UART_MODEM_FAX_DATA, UART_IRDA_TRACE,