diff --git a/SerialPorts.c b/SerialPorts.c index 663abb4..b4d0235 100644 --- a/SerialPorts.c +++ b/SerialPorts.c @@ -582,20 +582,6 @@ static void vSerialPort_InitUSART6(tSerialPortArtery *env) { void SerialPorts_Init(tRs485DirectionPins *directionPins) { tSerialPorts *env = &SERIAL_PORTS; -/* - vSerialPort_InitUSART3(&env->Rs485); - SERIAL_PORTS.Rs485_IO = vSerialPortGetIo(&SERIAL_PORTS.Rs485); - - SERIAL_PORTS.Rs485_HalfDuplex = vSerialPortHalfDuplexInit(&SERIAL_PORTS.Rs485_IO, - &directionPins->de); - - SERIAL_PORTS.Rs485_HalfDuplexIo = vSerialPortHalfDuplexGetIo(&SERIAL_PORTS.Rs485_HalfDuplex); - - - - vSerialPort_InitUSART5(&env->Rs232); - SERIAL_PORTS.Rs232_IO = vSerialPortGetIo(&SERIAL_PORTS.Rs232); -*/ vSerialPort_InitUSART3(&env->DEBUG_USART3); SERIAL_PORTS.DEBUG_USART3_IO = vSerialPortGetIo(&SERIAL_PORTS.DEBUG_USART3); @@ -612,28 +598,16 @@ void SerialPorts_Init(tRs485DirectionPins *directionPins) { SerialPortVirt_Init(&env->cliVirtualPortOut, 4096); env->cliVirtualPortOut_Io = SerialPortVirt_GetIo(&env->cliVirtualPortOut); -/* - vSerialPort_InitUSART2(&env->PRO04); - SERIAL_PORTS.PRO04IO = vSerialPortGetIo(&SERIAL_PORTS.PRO04); - SERIAL_PORTS.PRO04_snif_IO = vSerialPortGetSnifferIo(&SERIAL_PORTS.PRO04); - vSerialPort_InitUSART3(&env->MBEE); - SERIAL_PORTS.MBEEIO = vSerialPortGetIo(&SERIAL_PORTS.MBEE); - vSerialPort_InitUSART1(&env->GSM); - SERIAL_PORTS.GSMIO = vSerialPortGetIo(&SERIAL_PORTS.GSM); - SERIAL_PORTS.GSM_snif_IO = vSerialPortGetSnifferIo(&SERIAL_PORTS.GSM); + SerialPortUsb_Init(&env->SerialPortUsb1, 1, 1024, 1024); + env->SerialPortUsb1IO = SerialPortUsb_GetIo(&env->SerialPortUsb1); + env->SerialPortUsb1SnifferIO = SerialPortUsb_GetSnifferIo(&env->SerialPortUsb1); - vSerialPort_InitUSART6(&env->ComInt); - SERIAL_PORTS.ComIntIO = vSerialPortGetIo(&SERIAL_PORTS.ComInt); - SerialPortP2p_Init(&env->cliVirtualPort, 1024, 1024); - env->cliVirtualInIo = SerialPortP2p_GetIoFirst(&env->cliVirtualPort); - env->cliVirtualOutIo = SerialPortP2p_GetIoSecond(&env->cliVirtualPort); -*/ - SerialPortUsb_Init(&env->SerialPortUsb, 1, 1024, 1024); - env->SerialPortUsbIO = SerialPortUsb_GetIo(&env->SerialPortUsb); - env->SerialPortUsbSnifferIO = SerialPortUsb_GetSnifferIo(&env->SerialPortUsb); + SerialPortUsb_Init(&env->SerialPortUsb2, 2, 1024, 1024); + env->SerialPortUsb2IO = SerialPortUsb_GetIo(&env->SerialPortUsb2); + env->SerialPortUsb2SnifferIO = SerialPortUsb_GetSnifferIo(&env->SerialPortUsb2); } \ No newline at end of file diff --git a/SerialPorts.h b/SerialPorts.h index 73d8807..4665be7 100644 --- a/SerialPorts.h +++ b/SerialPorts.h @@ -55,9 +55,13 @@ typedef struct { tSerialPortVirt cliVirtualPortOut; tSerialPortIO cliVirtualPortOut_Io; - tSerialPortUsbArtery SerialPortUsb; - tSerialPortIO SerialPortUsbIO; - tSerialPortIO SerialPortUsbSnifferIO; + tSerialPortUsbArtery SerialPortUsb1; + tSerialPortIO SerialPortUsb1IO; + tSerialPortIO SerialPortUsb1SnifferIO; + + tSerialPortUsbArtery SerialPortUsb2; + tSerialPortIO SerialPortUsb2IO; + tSerialPortIO SerialPortUsb2SnifferIO; } tSerialPorts;