Optimalization of print methods

Sending is now done by interrupt

diff --git a/CommandStoring.dil b/CommandStoring.dil
index 439128213398836401efd274cc56a129b860ec38..0bde8e9995c380822e5b2946bbe927d565760dd4 100644 (file)
--- a/CommandStoring.dil
+++ b/CommandStoring.dil
@@ -1,4 +1,4 @@
-# TMS570LS3137ZWT 08/07/12 14:21:44\r
+# TMS570LS3137ZWT 08/13/12 14:44:07\r
 # \r
 ARCH=TMS570LS3137ZWT\r
 # \r
@@ -1629,7 +1629,7 @@ DRIVER.SCI.VAR.SCI_PORT_BIT1_PULDIS.VALUE=0
 DRIVER.SCI.VAR.SCI_FEINTENA.VALUE=0\r
 DRIVER.SCI.VAR.SCILIN_PORT_BIT0_DOUT.VALUE=0\r
 DRIVER.SCI.VAR.SCI_OEINTLVL.VALUE=0\r
-DRIVER.SCI.VAR.SCI_TXINTENA.VALUE=0\r
+DRIVER.SCI.VAR.SCI_TXINTENA.VALUE=1\r
 DRIVER.SCI.VAR.SCILIN_PARITYENA.VALUE=0\r
 DRIVER.SCI.VAR.SCILIN_PORT_BIT1_DOUT.VALUE=0\r
 DRIVER.SCI.VAR.SCI_PORT_BIT0_DOUT.VALUE=0\r

diff --git a/Debug/CmdProcTISCI.map b/Debug/CmdProcTISCI.map
index 0db61a760852e72ad67ad52be7547b8211a4dbcd..53c336f0d49ed86ff27c0f00f9036d6074268ae7 100644 (file)
--- a/Debug/CmdProcTISCI.map
+++ b/Debug/CmdProcTISCI.map
@@ -1,10 +1,10 @@
 ******************************************************************************
                   TMS470 Linker Unix v4.9.1                    
 ******************************************************************************
->> Linked Tue Aug  7 16:49:31 2012
+>> Linked Tue Aug 14 09:43:56 2012
 
 OUTPUT FILE NAME:   <CmdProcTISCI.out>
-ENTRY POINT SYMBOL: "_c_int00"  address: 00004be0
+ENTRY POINT SYMBOL: "_c_int00"  address: 000045e0
 
 
 MEMORY CONFIGURATION
@@ -12,7 +12,7 @@ MEMORY CONFIGURATION
          name            origin    length      used     unused   attr    fill
 ----------------------  --------  ---------  --------  --------  ----  --------
   VECTORS               00000000   00000020  00000020  00000000     X
-  FLASH0                00000020   0017ffe0  000089d0  00177610  R  X
+  FLASH0                00000020   0017ffe0  000088a8  00177738  R  X
   FLASH1                00180000   00180000  00000000  00180000  R  X
   STACKS                08000000   00001500  00000000  00001500  RW  
   RAM                   08001500   00026b00  00004234  000228cc  RW  
@@ -22,11 +22,11 @@ SEGMENT ALLOCATION MAP
 
 run origin  load origin   length   init length attrs members
 ----------  ----------- ---------- ----------- ----- -------
-00000000    00000000    000089f0   000089f0    r-x
+00000000    00000000    000088c8   000088c8    r-x
   00000000    00000000    00000020   00000020    r-x .intvecs
-  00000020    00000020    000080dc   000080dc    r-x .text
-  000080fc    000080fc    00000834   00000834    r-- .const
-  00008930    00008930    000000c0   000000c0    r-- .cinit
+  00000020    00000020    00007fb4   00007fb4    r-x .text
+  00007fd4    00007fd4    00000834   00000834    r-- .const
+  00008808    00008808    000000c0   000000c0    r-- .cinit
 08001500    08001500    00004144   00000000    rw-
   08001500    08001500    00004144   00000000    rw- .bss
 08005644    08005644    000000f0   000000f0    rw-
@@ -41,76 +41,76 @@ section   page    origin      length       input sections
 .intvecs   0    00000000    00000020     
                   00000000    00000020     sys_intvecs.obj (.intvecs)
 
-.text      0    00000020    000080dc     
+.text      0    00000020    00007fb4     
                   00000020    000014c8     sys_selftest.obj (.text)
                   000014e8    00001460     os_tasks.obj (.text)
                   00002948    00000b48     os_queue.obj (.text)
                   00003490    00000b18     cmd_proc.obj (.text)
                   00003fa8    00000638     os_port.obj (.text)
-                  000045e0    00000600     sci.obj (.text)
-                  00004be0    000005a8     sys_startup.obj (.text:retain)
-                  00005188    0000043c     esm.obj (.text)
-                  000055c4    000003cc     cmd_io_line.obj (.text)
-                  00005990    00000384     sys_core.obj (.text)
-                  00005d14    0000037c     cmdio_tisci.obj (.text)
-                  00006090    00000378     sci.obj (.text:retain)
-                  00006408    00000308     commands.obj (.text)
-                  00006710    00000308     system.obj (.text)
-                  00006a18    00000300     pinmux.obj (.text)
-                  00006d18    000002b8     i2str.obj (.text)
-                  00006fd0    00000240     os_list.obj (.text)
-                  00007210    00000220     esm.obj (.text:retain)
-                  00007430    000001d4     cmd_io.obj (.text)
-                  00007604    000001c8     cmd_proc_freertos_tms570.obj (.text)
-                  000077cc    0000016c     os_portasm.obj (.text)
-                  00007938    00000150     cmd_proc_run.obj (.text)
-                  00007a88    000000e8     os_heap.obj (.text)
-                  00007b70    000000c0     dabort.obj (.text)
-                  00007c30    0000009c     rtsv7R4_T_be_v3D16_eabi.lib : memcpy_t2.obj (.text)
-                  00007ccc    00000088     notification.obj (.text)
-                  00007d54    00000078     rtsv7R4_T_be_v3D16_eabi.lib : memset_t2.obj (.text)
-                  00007dcc    00000060                                 : copy_decompress_rle.obj (.text)
-                  00007e2c    00000054                                 : u_div32.obj (.text)
-                  00007e80    00000050                                 : atoi.obj (.text)
-                  00007ed0    00000050                                 : atol.obj (.text)
-                  00007f20    0000004c                                 : cpy_tbl.obj (.text)
-                  00007f6c    00000048     sys_main.obj (.text)
-                  00007fb4    00000044     rtsv7R4_T_be_v3D16_eabi.lib : exit.obj (.text)
-                  00007ff8    00000030                                 : strncpy.obj (.text)
-                  00008028    00000026                                 : strncmp.obj (.text)
-                  0000804e    00000002     --HOLE-- [fill = 0]
-                  00008050    00000018                                 : _lock.obj (.text)
-                  00008068    00000016                                 : strchr.obj (.text)
-                  0000807e    00000014                                 : strlen.obj (.text)
-                  00008092    00000012                                 : copy_zero_init.obj (.text:decompress:ZI)
-                  000080a4    00000010                                 : isalnum.obj (.text)
-                  000080b4    00000010                                 : isdigit.obj (.text)
-                  000080c4    00000010                                 : isspace.obj (.text)
-                  000080d4    00000010                                 : strcpy.obj (.text)
-                  000080e4    0000000e                                 : copy_decompress_none.obj (.text:decompress:none)
-                  000080f2    00000006                                 : copy_decompress_rle.obj (.text:decompress:rle24)
-                  000080f8    00000004     sys_phantom.obj (.text:retain)
+                  000045e0    000005a8     sys_startup.obj (.text:retain)
+                  00004b88    00000540     sci.obj (.text)
+                  000050c8    0000043c     esm.obj (.text)
+                  00005504    000003cc     cmd_io_line.obj (.text)
+                  000058d0    000003bc     cmdio_tisci.obj (.text)
+                  00005c8c    00000384     sci.obj (.text:retain)
+                  00006010    00000384     sys_core.obj (.text)
+                  00006394    00000308     system.obj (.text)
+                  0000669c    00000300     pinmux.obj (.text)
+                  0000699c    000002b8     i2str.obj (.text)
+                  00006c54    0000029c     commands.obj (.text)
+                  00006ef0    00000240     os_list.obj (.text)
+                  00007130    00000220     esm.obj (.text:retain)
+                  00007350    000001d4     cmd_io.obj (.text)
+                  00007524    00000180     cmd_proc_freertos_tms570.obj (.text)
+                  000076a4    0000016c     os_portasm.obj (.text)
+                  00007810    00000150     cmd_proc_run.obj (.text)
+                  00007960    000000e8     os_heap.obj (.text)
+                  00007a48    000000c0     dabort.obj (.text)
+                  00007b08    0000009c     rtsv7R4_T_be_v3D16_eabi.lib : memcpy_t2.obj (.text)
+                  00007ba4    00000088     notification.obj (.text)
+                  00007c2c    00000078     rtsv7R4_T_be_v3D16_eabi.lib : memset_t2.obj (.text)
+                  00007ca4    00000060                                 : copy_decompress_rle.obj (.text)
+                  00007d04    00000054                                 : u_div32.obj (.text)
+                  00007d58    00000050                                 : atoi.obj (.text)
+                  00007da8    00000050                                 : atol.obj (.text)
+                  00007df8    0000004c                                 : cpy_tbl.obj (.text)
+                  00007e44    00000048     sys_main.obj (.text)
+                  00007e8c    00000044     rtsv7R4_T_be_v3D16_eabi.lib : exit.obj (.text)
+                  00007ed0    00000030                                 : strncpy.obj (.text)
+                  00007f00    00000026                                 : strncmp.obj (.text)
+                  00007f26    00000002     --HOLE-- [fill = 0]
+                  00007f28    00000018                                 : _lock.obj (.text)
+                  00007f40    00000016                                 : strchr.obj (.text)
+                  00007f56    00000014                                 : strlen.obj (.text)
+                  00007f6a    00000012                                 : copy_zero_init.obj (.text:decompress:ZI)
+                  00007f7c    00000010                                 : isalnum.obj (.text)
+                  00007f8c    00000010                                 : isdigit.obj (.text)
+                  00007f9c    00000010                                 : isspace.obj (.text)
+                  00007fac    00000010                                 : strcpy.obj (.text)
+                  00007fbc    0000000e                                 : copy_decompress_none.obj (.text:decompress:none)
+                  00007fca    00000006                                 : copy_decompress_rle.obj (.text:decompress:rle24)
+                  00007fd0    00000004     sys_phantom.obj (.text:retain)
 
-.const     0    000080fc    00000834     
-                  000080fc    00000304     commands.obj (.const:.string)
-                  00008400    00000204     sys_startup.obj (.const:s_vim_init)
-                  00008604    00000187     commands.obj (.const)
-                  0000878b    00000001     --HOLE-- [fill = 0]
-                  0000878c    00000101     rtsv7R4_T_be_v3D16_eabi.lib : ctype.obj (.const:_ctypes_)
-                  0000888d    00000003     --HOLE-- [fill = 0]
-                  00008890    00000038     cmd_proc_freertos_tms570.obj (.const:$P$T0$1)
-                  000088c8    00000026     commands.obj (.const:$P$T0$1)
-                  000088ee    00000002     --HOLE-- [fill = 0]
-                  000088f0    00000023     commands.obj (.const:$P$T1$2)
-                  00008913    00000001     --HOLE-- [fill = 0]
-                  00008914    0000001c     cmdio_std_line.obj (.const)
+.const     0    00007fd4    00000834     
+                  00007fd4    00000304     commands.obj (.const:.string)
+                  000082d8    00000204     sys_startup.obj (.const:s_vim_init)
+                  000084dc    00000187     commands.obj (.const)
+                  00008663    00000001     --HOLE-- [fill = 0]
+                  00008664    00000101     rtsv7R4_T_be_v3D16_eabi.lib : ctype.obj (.const:_ctypes_)
+                  00008765    00000003     --HOLE-- [fill = 0]
+                  00008768    00000038     cmd_proc_freertos_tms570.obj (.const:$P$T0$1)
+                  000087a0    00000026     commands.obj (.const:$P$T0$1)
+                  000087c6    00000002     --HOLE-- [fill = 0]
+                  000087c8    00000023     commands.obj (.const:$P$T1$2)
+                  000087eb    00000001     --HOLE-- [fill = 0]
+                  000087ec    0000001c     cmdio_std_line.obj (.const)
 
-.cinit     0    00008930    000000c0     
-                  00008930    00000098     (.cinit..data.load) [load image, compression = rle]
-                  000089c8    0000000c     (__TI_handler_table)
-                  000089d4    00000004     --HOLE-- [fill = 0]
-                  000089d8    00000008     (.cinit..bss.load) [load image, compression = zero_init]
-                  000089e0    00000010     (__TI_cinit_table)
+.cinit     0    00008808    000000c0     
+                  00008808    00000099     (.cinit..data.load) [load image, compression = rle]
+                  000088a1    00000003     --HOLE-- [fill = 0]
+                  000088a4    0000000c     (__TI_handler_table)
+                  000088b0    00000008     (.cinit..bss.load) [load image, compression = zero_init]
+                  000088b8    00000010     (__TI_cinit_table)
 
 .bss       0    08001500    00004144     UNINITIALIZED
                   08001500    00003fa0     os_heap.obj (.bss:xHeap)
@@ -136,14 +136,14 @@ section   page    origin      length       input sections
 
 LINKER GENERATED COPY TABLES
 
-__TI_cinit_table @ 000089e0 records: 2, size/record: 8, table size: 16
-       .data: load addr=00008930, load size=00000098 bytes, run addr=08005644, run size=000000f0 bytes, compression=rle
-       .bss: load addr=000089d8, load size=00000008 bytes, run addr=08001500, run size=00004144 bytes, compression=zero_init
+__TI_cinit_table @ 000088b8 records: 2, size/record: 8, table size: 16
+       .data: load addr=00008808, load size=00000099 bytes, run addr=08005644, run size=000000f0 bytes, compression=rle
+       .bss: load addr=000088b0, load size=00000008 bytes, run addr=08001500, run size=00004144 bytes, compression=zero_init
 
 
 LINKER GENERATED HANDLER TABLE
 
-__TI_handler_table @ 000089c8 records: 3, size/record: 4, table size: 12
+__TI_handler_table @ 000088a4 records: 3, size/record: 4, table size: 12
        index: 0, handler: __TI_zero_init
        index: 1, handler: __TI_decompress_rle24
        index: 2, handler: __TI_decompress_none
@@ -153,74 +153,74 @@ GLOBAL SYMBOLS: SORTED ALPHABETICALLY BY Name
 
 address    name
 --------   ----
-00007fb5   C$$EXIT
-000089e0   __TI_CINIT_Base
-000089f0   __TI_CINIT_Limit
-000089c8   __TI_Handler_Table_Base
-000089d4   __TI_Handler_Table_Limit
-00005d0c   __TI_PINIT_Base
-00005d10   __TI_PINIT_Limit
-000080e5   __TI_decompress_none
-000080f3   __TI_decompress_rle24
+00007e8d   C$$EXIT
+000088b8   __TI_CINIT_Base
+000088c8   __TI_CINIT_Limit
+000088a4   __TI_Handler_Table_Base
+000088b0   __TI_Handler_Table_Limit
+0000638c   __TI_PINIT_Base
+00006390   __TI_PINIT_Limit
+00007fbd   __TI_decompress_none
+00007fcb   __TI_decompress_rle24
 00000000   __TI_static_base__
-00008093   __TI_zero_init
-00007d55   __aeabi_memclr
-00007d55   __aeabi_memclr4
-00007d55   __aeabi_memclr8
-00007c31   __aeabi_memcpy
-00007c31   __aeabi_memcpy4
-00007c31   __aeabi_memcpy8
-00007d57   __aeabi_memset
-00007d57   __aeabi_memset4
-00007d57   __aeabi_memset8
-00007e2c   __aeabi_uidivmod
+00007f6b   __TI_zero_init
+00007c2d   __aeabi_memclr
+00007c2d   __aeabi_memclr4
+00007c2d   __aeabi_memclr8
+00007b09   __aeabi_memcpy
+00007b09   __aeabi_memcpy4
+00007b09   __aeabi_memcpy8
+00007c2f   __aeabi_memset
+00007c2f   __aeabi_memset4
+00007c2f   __aeabi_memset8
+00007d04   __aeabi_uidivmod
 ffffffff   __binit__
 ffffffff   __c_args__
-00004be0   _c_int00
+000045e0   _c_int00
 08005724   _cleanup_ptr
-00005c34   _coreClearAuxiliaryDataFault_
-00005c50   _coreClearAuxiliaryInstructionFault_
-00005bfc   _coreClearDataFaultAddress_
-00005bc4   _coreClearDataFault_
-00005c18   _coreClearInstructionFaultAddress_
-00005be0   _coreClearInstructionFault_
-00005b28   _coreDisableEventBusExport_
-00005b8c   _coreDisableFlashEcc_
-00005b58   _coreDisableRamEcc_
-00005b10   _coreEnableEventBusExport_
-00005b70   _coreEnableFlashEcc_
-00005ba4   _coreEnableIrqVicOffset_
-00005b40   _coreEnableRamEcc_
-00005af8   _coreEnableVfp_
-00005c2c   _coreGetAuxiliaryDataFault_
-00005c48   _coreGetAuxiliaryInstructionFault_
-00005bf4   _coreGetDataFaultAddress_
-00005bbc   _coreGetDataFault_
-00005c10   _coreGetInstructionFaultAddress_
-00005bd8   _coreGetInstructionFault_
-00005990   _coreInitRegisters_
-00005a90   _coreInitStackPointer_
-0000878c   _ctypes_
-00007b70   _dabort
-00005c6c   _disable_FIQ_interrupt_
-00005c74   _disable_IRQ_interrupt_
-00005c64   _disable_interrupt_
+000062b4   _coreClearAuxiliaryDataFault_
+000062d0   _coreClearAuxiliaryInstructionFault_
+0000627c   _coreClearDataFaultAddress_
+00006244   _coreClearDataFault_
+00006298   _coreClearInstructionFaultAddress_
+00006260   _coreClearInstructionFault_
+000061a8   _coreDisableEventBusExport_
+0000620c   _coreDisableFlashEcc_
+000061d8   _coreDisableRamEcc_
+00006190   _coreEnableEventBusExport_
+000061f0   _coreEnableFlashEcc_
+00006224   _coreEnableIrqVicOffset_
+000061c0   _coreEnableRamEcc_
+00006178   _coreEnableVfp_
+000062ac   _coreGetAuxiliaryDataFault_
+000062c8   _coreGetAuxiliaryInstructionFault_
+00006274   _coreGetDataFaultAddress_
+0000623c   _coreGetDataFault_
+00006290   _coreGetInstructionFaultAddress_
+00006258   _coreGetInstructionFault_
+00006010   _coreInitRegisters_
+00006110   _coreInitStackPointer_
+00008664   _ctypes_
+00007a48   _dabort
+000062ec   _disable_FIQ_interrupt_
+000062f4   _disable_IRQ_interrupt_
+000062e4   _disable_interrupt_
 08005728   _dtors_ptr
-00005c7c   _enable_interrupt_
-00005c84   _esmCcmErrorsClear_
-00005adc   _getCPSRValue_
-00005ae4   _gotoCPUIdle_
+000062fc   _enable_interrupt_
+00006304   _esmCcmErrorsClear_
+0000615c   _getCPSRValue_
+00006164   _gotoCPUIdle_
 0800571c   _lock
 00000138   _memoryInit_
-0000805d   _nop
-00008057   _register_lock
-00008051   _register_unlock
+00007f35   _nop
+00007f2f   _register_lock
+00007f29   _register_unlock
 08005720   _unlock
-00007fb9   abort
+00007e91   abort
 00000e28   adc1ParityCheck
 00000e94   adc2ParityCheck
-00007e81   atoi
-00007ed1   atol
+00007d59   atoi
+00007da9   atol
 ffffffff   binit
 00000f00   can1ParityCheck
 00000f80   can2ParityCheck
@@ -231,44 +231,44 @@ ffffffff   binit
 00000978   checkB1RAMECC
 00000a98   checkFlashECC
 000006d8   checkefcSelfTest
-00005f0c   clearBuffer
-00005eec   clearInputBuffer
-00005efc   clearOutputBuffer
-00008724   cmd_des_char
-0000873c   cmd_des_charmid
-00008694   cmd_des_error
-00008604   cmd_des_help
-00008754   cmd_des_hiddedn
-0000870c   cmd_des_num
-00008664   cmd_des_opchar_test
-000086c4   cmd_des_opchar_testro
-000086ac   cmd_des_param
-000086f4   cmd_des_prefix
-000086dc   cmd_des_test
-0000867c   cmd_des_testio
-0000861c   cmd_des_val
-00008634   cmd_des_valro
-0000864c   cmd_des_valwo
+00005b08   clearBuffer
+00005ae8   clearInputBuffer
+00005af8   clearOutputBuffer
+000085fc   cmd_des_char
+00008614   cmd_des_charmid
+0000856c   cmd_des_error
+000084dc   cmd_des_help
+0000862c   cmd_des_hiddedn
+000085e4   cmd_des_num
+0000853c   cmd_des_opchar_test
+0000859c   cmd_des_opchar_testro
+00008584   cmd_des_param
+000085cc   cmd_des_prefix
+000085b4   cmd_des_test
+00008554   cmd_des_testio
+000084f4   cmd_des_val
+0000850c   cmd_des_valro
+00008524   cmd_des_valwo
 00003da0   cmd_do_help
 00003bd8   cmd_do_rw_int
 00003c78   cmd_do_rw_long
 00003b38   cmd_do_rw_short
 00003ab4   cmd_do_stamp
-00006620   cmd_do_test
-00006664   cmd_do_testcmdio
-00006604   cmd_do_testerror
-00006408   cmd_do_testopchar
-00006548   cmd_do_testparam
-00005634   cmd_ed_line_buf
+00006db8   cmd_do_test
+00006df0   cmd_do_testcmdio
+00006d9c   cmd_do_testerror
+00006c54   cmd_do_testopchar
+00006d28   cmd_do_testparam
+00005574   cmd_ed_line_buf
 08005700   cmd_io_buf
-00005864   cmd_io_line_in
-0000576c   cmd_io_line_out
-0000574c   cmd_io_line_putc
-0000593c   cmd_io_line_rdline
-00007474   cmd_io_puts
-00007580   cmd_io_read_bychar
-00008914   cmd_io_std_line
-00007508   cmd_io_write_bychar
+000057a4   cmd_io_line_in
+000056ac   cmd_io_line_out
+0000568c   cmd_io_line_putc
+0000587c   cmd_io_line_rdline
+00007394   cmd_io_puts
+000074a0   cmd_io_read_bychar
+000087ec   cmd_io_std_line
+00007428   cmd_io_write_bychar
 0800569c   cmd_list
 08005644   cmd_list_1
 0800565c   cmd_list_2
@@ -276,8 +276,8 @@ ffffffff   binit
 000039e4   cmd_num_suffix
 00003968   cmd_opchar_check
 00003d18   cmd_opchar_replong
-00007974   cmd_processor_run
-00007f21   copy_in
+0000784c   cmd_processor_run
+00007df9   copy_in
 00000224   cpuSelfTest
 00000b68   cpuSelfTestFail
 00000b60   custom_dabort
@@ -291,25 +291,25 @@ ffffffff   binit
 00000774   efcClass2Error
 000006b0   efcSelfTest
 000005fc   efcStuckZeroTest
-00005338   esmActivateNormalOperation
-00005424   esmClearStatus
-00005464   esmClearStatusBuffer
-000052fc   esmDisableError
-00005374   esmDisableInterrupt
-000052d0   esmEnableError
-00005348   esmEnableInterrupt
-000052b4   esmError
-000054b0   esmGetStatus
-00005514   esmGetStatusBuffer
-00007ccc   esmGroup1Notification
-00007cd8   esmGroup2Notification
-00007210   esmHighInterrupt
-00005188   esmInit
-00007354   esmLowInterrupt
-00005490   esmSetCounterPreloadValue
-000053a0   esmSetInterruptLevel
-00005328   esmTriggerErrorPinReset
-00007fc1   exit
+00005278   esmActivateNormalOperation
+00005364   esmClearStatus
+000053a4   esmClearStatusBuffer
+0000523c   esmDisableError
+000052b4   esmDisableInterrupt
+00005210   esmEnableError
+00005288   esmEnableInterrupt
+000051f4   esmError
+000053f0   esmGetStatus
+00005454   esmGetStatusBuffer
+00007ba4   esmGroup1Notification
+00007bb0   esmGroup2Notification
+00007130   esmHighInterrupt
+000050c8   esmInit
+00007274   esmLowInterrupt
+000053d0   esmSetCounterPreloadValue
+000052e0   esmSetInterruptLevel
+00005268   esmTriggerErrorPinReset
+00007e99   exit
 00000b58   flashClass1Error
 00000b5c   flashClass2Error
 00000778   fmcBus2Check
@@ -317,29 +317,29 @@ ffffffff   binit
 00000850   fmcClass2Error
 000007b4   fmcECCcheck
 08005608   g_sciTransfer
-00005df4   genericPrint
-00005dac   genericRead
+000059a8   genericPrint
+00005960   genericRead
 00000c54   het1ParityCheck
 00000d30   het2ParityCheck
 00000cbc   htu1ParityCheck
 00000db4   htu2ParityCheck
-00006d18   i2str
+0000699c   i2str
 0800562c   inBuffer
-00007604   initCmdProc
-00005d14   initIoBuffer
-000080a5   isalnum
-000080b5   isdigit
-000080c5   isspace
-00007f6c   main
-00006824   mapClocks
-00007c31   memcpy
-00007ce4   memoryPort0TestFailNotification
-00007cfc   memoryPort1TestFailNotification
-00007d5d   memset
+00007524   initCmdProc
+000058d0   initIoBuffer
+00007f7d   isalnum
+00007f8d   isdigit
+00007f9d   isspace
+00007e44   main
+000064a8   mapClocks
+00007b09   memcpy
+00007bbc   memoryPort0TestFailNotification
+00007bd4   memoryPort1TestFailNotification
+00007c35   memset
 000010a4   mibspi1ParityCheck
 0000118c   mibspi3ParityCheck
 00001284   mibspi5ParityCheck
-00006a18   muxInit
+0000669c   muxInit
 08005620   outBuffer
 000004ec   pbistIsTestCompleted
 00000508   pbistIsTestPassed
@@ -348,73 +348,73 @@ ffffffff   binit
 000002a4   pbistSelfCheck
 000003e0   pbistSelfCheckFail
 000004bc   pbistStop
-000067cc   periphInit
-000080f8   phantomInterrupt
-00005d74   print
+00006450   periphInit
+00007fd0   phantomInterrupt
+00005930   print
 00003544   proc_cmd_line
-0000775c   processCmd
+00007644   processCmd
 08005638   processCmdHandler
 0800563c   prompt
-00007a88   pvPortMalloc
+00007960   pvPortMalloc
 080056d0   pxCurrentTCB
 00003fa8   pxPortInitialiseStack
-00005d94   read
-00004aa0   sciDisableLoopback
-00004b2c   sciDisableNotification
-00004a6c   sciEnableLoopback
-00004ac4   sciEnableNotification
-00006090   sciHighLevelInterrupt
-000045e0   sciInit
-000048b0   sciIsRxReady
-00004754   sciIsTxReady
-00006224   sciLowLevelInterrupt
-00007d14   sciNotification
-00004924   sciReceive
-000048fc   sciReceiveByte
-000048cc   sciRxError
-000047a0   sciSend
-00004770   sciSendByte
-000046d4   sciSetBaudrate
-000046b4   sciSetFunctional
-0000678c   setupFlash
-00006710   setupPLL
+00005948   read
+00004f8c   sciDisableLoopback
+00005010   sciDisableNotification
+00004f58   sciEnableLoopback
+00004fa8   sciEnableNotification
+00005c8c   sciHighLevelInterrupt
+00004b88   sciInit
+00004e5c   sciIsRxReady
+00004cfc   sciIsTxReady
+00005e24   sciLowLevelInterrupt
+00007bec   sciNotification
+00004ed0   sciReceive
+00004ea8   sciReceiveByte
+00004e78   sciRxError
+00004d48   sciSend
+00004d18   sciSendByte
+00004c7c   sciSetBaudrate
+00004c5c   sciSetFunctional
+00006410   setupFlash
+00006394   setupPLL
 00003510   skip_white
 0000017c   stcSelfCheck
 00000b64   stcSelfCheckFail
-00008069   strchr
-000080d5   strcpy
-0000807f   strlen
-00008029   strncmp
-00007ff9   strncpy
-000068fc   systemInit
-00006988   systemPowerDown
+00007f41   strchr
+00007fad   strcpy
+00007f57   strlen
+00007f01   strncmp
+00007ed1   strncpy
+00006580   systemInit
+0000660c   systemPowerDown
 00000a90   tcramClass1Error
 00000a94   tcramClass2Error
-00005f8c   tisci_getc
-00005f54   tisci_putc
-00006000   tisci_read
-00005fbc   tisci_write
-00006744   trimLPO
+00005b8c   tisci_getc
+00005b50   tisci_putc
+00005bfc   tisci_read
+00005bbc   tisci_write
+000063c8   trimLPO
 08005730   ulCriticalNesting
 000030bc   uxQueueMessagesWaiting
 000030e0   uxQueueMessagesWaitingFromISR
 00001ebc   uxTaskGetNumberOfTasks
 0000269c   uxTaskGetStackHighWaterMark
 0000184c   uxTaskPriorityGet
-00006fd0   vListInitialise
-00007028   vListInitialiseItem
-000070c8   vListInsert
-00007044   vListInsertEnd
-0000718c   vListRemove
+00006ef0   vListInitialise
+00006f48   vListInitialiseItem
+00006fe8   vListInsert
+00006f64   vListInsertEnd
+000070ac   vListRemove
 0000449c   vPortEndScheduler
 000044a0   vPortEnterCritical
 000044b8   vPortExitCritical
-00007b30   vPortFree
-00007b40   vPortInitialiseBlocks
-000077cc   vPortStartFirstTask
-00007924   vPortYield
-00007800   vPortYieldProcessor
-00007888   vPreemptiveTick
+00007a08   vPortFree
+00007a18   vPortInitialiseBlocks
+000076a4   vPortStartFirstTask
+000077fc   vPortYield
+000076d8   vPortYieldProcessor
+00007760   vPreemptiveTick
 00003100   vQueueDelete
 000017e4   vTaskDelay
 000016e8   vTaskDelayUntil
@@ -433,7 +433,7 @@ ffffffff   binit
 000020a8   vTaskSwitchContext
 08005640   val
 00000b6c   vimParityCheck
-00007b50   xPortGetFreeHeapSize
+00007a28   xPortGetFreeHeapSize
 00004488   xPortStartScheduler
 00002948   xQueueCreate
 00002b34   xQueueCreateCountingSemaphore
@@ -560,181 +560,181 @@ address    name
 0000449c   vPortEndScheduler
 000044a0   vPortEnterCritical
 000044b8   vPortExitCritical
-000045e0   sciInit
-000046b4   sciSetFunctional
-000046d4   sciSetBaudrate
-00004754   sciIsTxReady
-00004770   sciSendByte
-000047a0   sciSend
-000048b0   sciIsRxReady
-000048cc   sciRxError
-000048fc   sciReceiveByte
-00004924   sciReceive
-00004a6c   sciEnableLoopback
-00004aa0   sciDisableLoopback
-00004ac4   sciEnableNotification
-00004b2c   sciDisableNotification
-00004be0   _c_int00
-00005188   esmInit
-000052b4   esmError
-000052d0   esmEnableError
-000052fc   esmDisableError
-00005328   esmTriggerErrorPinReset
-00005338   esmActivateNormalOperation
-00005348   esmEnableInterrupt
-00005374   esmDisableInterrupt
-000053a0   esmSetInterruptLevel
-00005424   esmClearStatus
-00005464   esmClearStatusBuffer
-00005490   esmSetCounterPreloadValue
-000054b0   esmGetStatus
-00005514   esmGetStatusBuffer
-00005634   cmd_ed_line_buf
-0000574c   cmd_io_line_putc
-0000576c   cmd_io_line_out
-00005864   cmd_io_line_in
-0000593c   cmd_io_line_rdline
-00005990   _coreInitRegisters_
-00005a90   _coreInitStackPointer_
-00005adc   _getCPSRValue_
-00005ae4   _gotoCPUIdle_
-00005af8   _coreEnableVfp_
-00005b10   _coreEnableEventBusExport_
-00005b28   _coreDisableEventBusExport_
-00005b40   _coreEnableRamEcc_
-00005b58   _coreDisableRamEcc_
-00005b70   _coreEnableFlashEcc_
-00005b8c   _coreDisableFlashEcc_
-00005ba4   _coreEnableIrqVicOffset_
-00005bbc   _coreGetDataFault_
-00005bc4   _coreClearDataFault_
-00005bd8   _coreGetInstructionFault_
-00005be0   _coreClearInstructionFault_
-00005bf4   _coreGetDataFaultAddress_
-00005bfc   _coreClearDataFaultAddress_
-00005c10   _coreGetInstructionFaultAddress_
-00005c18   _coreClearInstructionFaultAddress_
-00005c2c   _coreGetAuxiliaryDataFault_
-00005c34   _coreClearAuxiliaryDataFault_
-00005c48   _coreGetAuxiliaryInstructionFault_
-00005c50   _coreClearAuxiliaryInstructionFault_
-00005c64   _disable_interrupt_
-00005c6c   _disable_FIQ_interrupt_
-00005c74   _disable_IRQ_interrupt_
-00005c7c   _enable_interrupt_
-00005c84   _esmCcmErrorsClear_
-00005d0c   __TI_PINIT_Base
-00005d10   __TI_PINIT_Limit
-00005d14   initIoBuffer
-00005d74   print
-00005d94   read
-00005dac   genericRead
-00005df4   genericPrint
-00005eec   clearInputBuffer
-00005efc   clearOutputBuffer
-00005f0c   clearBuffer
-00005f54   tisci_putc
-00005f8c   tisci_getc
-00005fbc   tisci_write
-00006000   tisci_read
-00006090   sciHighLevelInterrupt
-00006224   sciLowLevelInterrupt
-00006408   cmd_do_testopchar
-00006548   cmd_do_testparam
-00006604   cmd_do_testerror
-00006620   cmd_do_test
-00006664   cmd_do_testcmdio
-00006710   setupPLL
-00006744   trimLPO
-0000678c   setupFlash
-000067cc   periphInit
-00006824   mapClocks
-000068fc   systemInit
-00006988   systemPowerDown
-00006a18   muxInit
-00006d18   i2str
-00006fd0   vListInitialise
-00007028   vListInitialiseItem
-00007044   vListInsertEnd
-000070c8   vListInsert
-0000718c   vListRemove
-00007210   esmHighInterrupt
-00007354   esmLowInterrupt
-00007474   cmd_io_puts
-00007508   cmd_io_write_bychar
-00007580   cmd_io_read_bychar
-00007604   initCmdProc
-0000775c   processCmd
-000077cc   vPortStartFirstTask
-00007800   vPortYieldProcessor
-00007888   vPreemptiveTick
-00007924   vPortYield
-00007974   cmd_processor_run
-00007a88   pvPortMalloc
-00007b30   vPortFree
-00007b40   vPortInitialiseBlocks
-00007b50   xPortGetFreeHeapSize
-00007b70   _dabort
-00007c31   __aeabi_memcpy
-00007c31   __aeabi_memcpy4
-00007c31   __aeabi_memcpy8
-00007c31   memcpy
-00007ccc   esmGroup1Notification
-00007cd8   esmGroup2Notification
-00007ce4   memoryPort0TestFailNotification
-00007cfc   memoryPort1TestFailNotification
-00007d14   sciNotification
-00007d55   __aeabi_memclr
-00007d55   __aeabi_memclr4
-00007d55   __aeabi_memclr8
-00007d57   __aeabi_memset
-00007d57   __aeabi_memset4
-00007d57   __aeabi_memset8
-00007d5d   memset
-00007e2c   __aeabi_uidivmod
-00007e81   atoi
-00007ed1   atol
-00007f21   copy_in
-00007f6c   main
-00007fb5   C$$EXIT
-00007fb9   abort
-00007fc1   exit
-00007ff9   strncpy
-00008029   strncmp
-00008051   _register_unlock
-00008057   _register_lock
-0000805d   _nop
-00008069   strchr
-0000807f   strlen
-00008093   __TI_zero_init
-000080a5   isalnum
-000080b5   isdigit
-000080c5   isspace
-000080d5   strcpy
-000080e5   __TI_decompress_none
-000080f3   __TI_decompress_rle24
-000080f8   phantomInterrupt
-00008604   cmd_des_help
-0000861c   cmd_des_val
-00008634   cmd_des_valro
-0000864c   cmd_des_valwo
-00008664   cmd_des_opchar_test
-0000867c   cmd_des_testio
-00008694   cmd_des_error
-000086ac   cmd_des_param
-000086c4   cmd_des_opchar_testro
-000086dc   cmd_des_test
-000086f4   cmd_des_prefix
-0000870c   cmd_des_num
-00008724   cmd_des_char
-0000873c   cmd_des_charmid
-00008754   cmd_des_hiddedn
-0000878c   _ctypes_
-00008914   cmd_io_std_line
-000089c8   __TI_Handler_Table_Base
-000089d4   __TI_Handler_Table_Limit
-000089e0   __TI_CINIT_Base
-000089f0   __TI_CINIT_Limit
+000045e0   _c_int00
+00004b88   sciInit
+00004c5c   sciSetFunctional
+00004c7c   sciSetBaudrate
+00004cfc   sciIsTxReady
+00004d18   sciSendByte
+00004d48   sciSend
+00004e5c   sciIsRxReady
+00004e78   sciRxError
+00004ea8   sciReceiveByte
+00004ed0   sciReceive
+00004f58   sciEnableLoopback
+00004f8c   sciDisableLoopback
+00004fa8   sciEnableNotification
+00005010   sciDisableNotification
+000050c8   esmInit
+000051f4   esmError
+00005210   esmEnableError
+0000523c   esmDisableError
+00005268   esmTriggerErrorPinReset
+00005278   esmActivateNormalOperation
+00005288   esmEnableInterrupt
+000052b4   esmDisableInterrupt
+000052e0   esmSetInterruptLevel
+00005364   esmClearStatus
+000053a4   esmClearStatusBuffer
+000053d0   esmSetCounterPreloadValue
+000053f0   esmGetStatus
+00005454   esmGetStatusBuffer
+00005574   cmd_ed_line_buf
+0000568c   cmd_io_line_putc
+000056ac   cmd_io_line_out
+000057a4   cmd_io_line_in
+0000587c   cmd_io_line_rdline
+000058d0   initIoBuffer
+00005930   print
+00005948   read
+00005960   genericRead
+000059a8   genericPrint
+00005ae8   clearInputBuffer
+00005af8   clearOutputBuffer
+00005b08   clearBuffer
+00005b50   tisci_putc
+00005b8c   tisci_getc
+00005bbc   tisci_write
+00005bfc   tisci_read
+00005c8c   sciHighLevelInterrupt
+00005e24   sciLowLevelInterrupt
+00006010   _coreInitRegisters_
+00006110   _coreInitStackPointer_
+0000615c   _getCPSRValue_
+00006164   _gotoCPUIdle_
+00006178   _coreEnableVfp_
+00006190   _coreEnableEventBusExport_
+000061a8   _coreDisableEventBusExport_
+000061c0   _coreEnableRamEcc_
+000061d8   _coreDisableRamEcc_
+000061f0   _coreEnableFlashEcc_
+0000620c   _coreDisableFlashEcc_
+00006224   _coreEnableIrqVicOffset_
+0000623c   _coreGetDataFault_
+00006244   _coreClearDataFault_
+00006258   _coreGetInstructionFault_
+00006260   _coreClearInstructionFault_
+00006274   _coreGetDataFaultAddress_
+0000627c   _coreClearDataFaultAddress_
+00006290   _coreGetInstructionFaultAddress_
+00006298   _coreClearInstructionFaultAddress_
+000062ac   _coreGetAuxiliaryDataFault_
+000062b4   _coreClearAuxiliaryDataFault_
+000062c8   _coreGetAuxiliaryInstructionFault_
+000062d0   _coreClearAuxiliaryInstructionFault_
+000062e4   _disable_interrupt_
+000062ec   _disable_FIQ_interrupt_
+000062f4   _disable_IRQ_interrupt_
+000062fc   _enable_interrupt_
+00006304   _esmCcmErrorsClear_
+0000638c   __TI_PINIT_Base
+00006390   __TI_PINIT_Limit
+00006394   setupPLL
+000063c8   trimLPO
+00006410   setupFlash
+00006450   periphInit
+000064a8   mapClocks
+00006580   systemInit
+0000660c   systemPowerDown
+0000669c   muxInit
+0000699c   i2str
+00006c54   cmd_do_testopchar
+00006d28   cmd_do_testparam
+00006d9c   cmd_do_testerror
+00006db8   cmd_do_test
+00006df0   cmd_do_testcmdio
+00006ef0   vListInitialise
+00006f48   vListInitialiseItem
+00006f64   vListInsertEnd
+00006fe8   vListInsert
+000070ac   vListRemove
+00007130   esmHighInterrupt
+00007274   esmLowInterrupt
+00007394   cmd_io_puts
+00007428   cmd_io_write_bychar
+000074a0   cmd_io_read_bychar
+00007524   initCmdProc
+00007644   processCmd
+000076a4   vPortStartFirstTask
+000076d8   vPortYieldProcessor
+00007760   vPreemptiveTick
+000077fc   vPortYield
+0000784c   cmd_processor_run
+00007960   pvPortMalloc
+00007a08   vPortFree
+00007a18   vPortInitialiseBlocks
+00007a28   xPortGetFreeHeapSize
+00007a48   _dabort
+00007b09   __aeabi_memcpy
+00007b09   __aeabi_memcpy4
+00007b09   __aeabi_memcpy8
+00007b09   memcpy
+00007ba4   esmGroup1Notification
+00007bb0   esmGroup2Notification
+00007bbc   memoryPort0TestFailNotification
+00007bd4   memoryPort1TestFailNotification
+00007bec   sciNotification
+00007c2d   __aeabi_memclr
+00007c2d   __aeabi_memclr4
+00007c2d   __aeabi_memclr8
+00007c2f   __aeabi_memset
+00007c2f   __aeabi_memset4
+00007c2f   __aeabi_memset8
+00007c35   memset
+00007d04   __aeabi_uidivmod
+00007d59   atoi
+00007da9   atol
+00007df9   copy_in
+00007e44   main
+00007e8d   C$$EXIT
+00007e91   abort
+00007e99   exit
+00007ed1   strncpy
+00007f01   strncmp
+00007f29   _register_unlock
+00007f2f   _register_lock
+00007f35   _nop
+00007f41   strchr
+00007f57   strlen
+00007f6b   __TI_zero_init
+00007f7d   isalnum
+00007f8d   isdigit
+00007f9d   isspace
+00007fad   strcpy
+00007fbd   __TI_decompress_none
+00007fcb   __TI_decompress_rle24
+00007fd0   phantomInterrupt
+000084dc   cmd_des_help
+000084f4   cmd_des_val
+0000850c   cmd_des_valro
+00008524   cmd_des_valwo
+0000853c   cmd_des_opchar_test
+00008554   cmd_des_testio
+0000856c   cmd_des_error
+00008584   cmd_des_param
+0000859c   cmd_des_opchar_testro
+000085b4   cmd_des_test
+000085cc   cmd_des_prefix
+000085e4   cmd_des_num
+000085fc   cmd_des_char
+00008614   cmd_des_charmid
+0000862c   cmd_des_hiddedn
+00008664   _ctypes_
+000087ec   cmd_io_std_line
+000088a4   __TI_Handler_Table_Base
+000088b0   __TI_Handler_Table_Limit
+000088b8   __TI_CINIT_Base
+000088c8   __TI_CINIT_Limit
 0800555c   ed_line_in_std
 080055b0   ed_line_out_std
 08005608   g_sciTransfer

diff --git a/Debug/CmdProcTISCI.out b/Debug/CmdProcTISCI.out
index a3829d62b82dbb104d7f00655407276c3c3bb857..6de2936a41f3016880e2e31f22994558423a0693 100644 (file)
Binary files a/Debug/CmdProcTISCI.out and b/Debug/CmdProcTISCI.out differ

diff --git a/Debug/source/cmd_io.obj b/Debug/source/cmd_io.obj
index dc9577edf3839ad907162e2ea072c47adc213cfb..deea6c2ecaa2b4e24f5c3105d5538b4b18229b45 100644 (file)
Binary files a/Debug/source/cmd_io.obj and b/Debug/source/cmd_io.obj differ

diff --git a/Debug/source/cmd_io_line.obj b/Debug/source/cmd_io_line.obj
index 5ea5e0dcdce41d1bc050a3b95e48e14e705a3627..6e1f5173254162564b72ac18d3d5ef6d858593ce 100644 (file)
Binary files a/Debug/source/cmd_io_line.obj and b/Debug/source/cmd_io_line.obj differ

diff --git a/Debug/source/cmd_proc.obj b/Debug/source/cmd_proc.obj
index 6e9a4c65ffbc9900fcf4563544dae4c46c6cf0b2..f0c04e518717d470fc07e1d1258579f500167982 100644 (file)
Binary files a/Debug/source/cmd_proc.obj and b/Debug/source/cmd_proc.obj differ

diff --git a/Debug/source/cmd_proc_freertos_tms570.obj b/Debug/source/cmd_proc_freertos_tms570.obj
index cb67160cc1288eb310b534cc758c31e284eb2ae2..88d96df401c7649f65f45b976a91a7f6ed3b4b68 100644 (file)
Binary files a/Debug/source/cmd_proc_freertos_tms570.obj and b/Debug/source/cmd_proc_freertos_tms570.obj differ

diff --git a/Debug/source/cmd_proc_freertos_tms570.pp b/Debug/source/cmd_proc_freertos_tms570.pp
index 96f508e83fcdb47816c7cb1f46ba9f36985b0f33..15ab09b9f19880c8c2e330035db0e068f8a52ea9 100644 (file)
--- a/Debug/source/cmd_proc_freertos_tms570.pp
+++ b/Debug/source/cmd_proc_freertos_tms570.pp
@@ -17,10 +17,10 @@ source/cmd_proc_freertos_tms570.obj: ../include/sys_core.h
 source/cmd_proc_freertos_tms570.obj: ../include/sys_common.h
 source/cmd_proc_freertos_tms570.obj: ../include/os_queue.h
 source/cmd_proc_freertos_tms570.obj: ../include/os_semphr.h
-source/cmd_proc_freertos_tms570.obj: ../include/sci.h
-source/cmd_proc_freertos_tms570.obj: ../include/gio.h
 source/cmd_proc_freertos_tms570.obj: ../include/os_task.h
 source/cmd_proc_freertos_tms570.obj: ../include/os_list.h
+source/cmd_proc_freertos_tms570.obj: ../include/sci.h
+source/cmd_proc_freertos_tms570.obj: ../include/gio.h
 
 ../source/cmd_proc_freertos_tms570.c: 
 ../include/cmd_proc_freertos_tms570.h: 
@@ -39,7 +39,7 @@ source/cmd_proc_freertos_tms570.obj: ../include/os_list.h
 ../include/sys_common.h: 
 ../include/os_queue.h: 
 ../include/os_semphr.h: 
-../include/sci.h: 
-../include/gio.h: 
 ../include/os_task.h: 
 ../include/os_list.h: 
+../include/sci.h: 
+../include/gio.h: 

diff --git a/Debug/source/cmd_proc_run.obj b/Debug/source/cmd_proc_run.obj
index 624d920d59da996faa77523926aca2e5fa550076..6c0989ebc2d318cd06968d4a5258b7d540612608 100644 (file)
Binary files a/Debug/source/cmd_proc_run.obj and b/Debug/source/cmd_proc_run.obj differ

diff --git a/Debug/source/cmdio_std_line.obj b/Debug/source/cmdio_std_line.obj
index e09e34026b84a0c6ab46be8fe76c3b8bee408415..ed3a7a8b69f33cf2e53bef8e3858e7ebb5c07ca6 100644 (file)
Binary files a/Debug/source/cmdio_std_line.obj and b/Debug/source/cmdio_std_line.obj differ

diff --git a/Debug/source/cmdio_tisci.obj b/Debug/source/cmdio_tisci.obj
index ab1e5b1e7fa5ed2248aa9eb3049b8d67c3cd9c0e..5dd6364748743d120673b35a20c9a636ecd2e2fc 100644 (file)
Binary files a/Debug/source/cmdio_tisci.obj and b/Debug/source/cmdio_tisci.obj differ

diff --git a/Debug/source/cmdio_tisci.pp b/Debug/source/cmdio_tisci.pp
index 68ea61a9da1d876dda0548f6410a3adc04d47d0a..f8b5676f5408ff3e08a13f6b920edb31d1343a2d 100644 (file)
--- a/Debug/source/cmdio_tisci.pp
+++ b/Debug/source/cmdio_tisci.pp
@@ -14,6 +14,8 @@ source/cmdio_tisci.obj: ../include/sys_core.h
 source/cmdio_tisci.obj: ../include/sys_common.h
 source/cmdio_tisci.obj: ../include/os_queue.h
 source/cmdio_tisci.obj: ../include/os_semphr.h
+source/cmdio_tisci.obj: ../include/os_task.h
+source/cmdio_tisci.obj: ../include/os_list.h
 source/cmdio_tisci.obj: ../include/sci.h
 source/cmdio_tisci.obj: ../include/gio.h
 
@@ -31,5 +33,7 @@ source/cmdio_tisci.obj: ../include/gio.h
 ../include/sys_common.h: 
 ../include/os_queue.h: 
 ../include/os_semphr.h: 
+../include/os_task.h: 
+../include/os_list.h: 
 ../include/sci.h: 
 ../include/gio.h: 

diff --git a/Debug/source/commands.obj b/Debug/source/commands.obj
index 85c55c4ea6ac7ebe5ba5bae120d0a8905e26d244..ce5c6934f07a319faf5469c2b05dc84d27b285b6 100644 (file)
Binary files a/Debug/source/commands.obj and b/Debug/source/commands.obj differ

diff --git a/Debug/source/commands.pp b/Debug/source/commands.pp
index 194ea5d1f53131c082e88beba9f2cef123c656f0..8f7033dd5bf4521adb400e9c4ed093689882d7c5 100644 (file)
--- a/Debug/source/commands.pp
+++ b/Debug/source/commands.pp
@@ -14,6 +14,8 @@ source/commands.obj: ../include/os_mpu_wrappers.h
 source/commands.obj: ../include/sys_core.h
 source/commands.obj: ../include/os_queue.h
 source/commands.obj: ../include/os_semphr.h
+source/commands.obj: ../include/os_task.h
+source/commands.obj: ../include/os_list.h
 source/commands.obj: ../include/sci.h
 source/commands.obj: ../include/gio.h
 source/commands.obj: /opt/ti/ccsv5/tools/compiler/tms470_4.9.1/include/string.h
@@ -35,6 +37,8 @@ source/commands.obj: /opt/ti/ccsv5/tools/compiler/tms470_4.9.1/include/stdarg.h
 ../include/sys_core.h: 
 ../include/os_queue.h: 
 ../include/os_semphr.h: 
+../include/os_task.h: 
+../include/os_list.h: 
 ../include/sci.h: 
 ../include/gio.h: 
 /opt/ti/ccsv5/tools/compiler/tms470_4.9.1/include/string.h: 

diff --git a/Debug/source/esm.obj b/Debug/source/esm.obj
index d68f7503c59cd9b5372655824d60b21a697d7427..9c4fa482d42a942c56e3354dba1105503de5e6d1 100644 (file)
Binary files a/Debug/source/esm.obj and b/Debug/source/esm.obj differ

diff --git a/Debug/source/i2str.obj b/Debug/source/i2str.obj
index a4a56be380cbacd17fdb1e96e3e58c35bc41b8d4..c274867df9509a80636065133ac79737cce5c47f 100644 (file)
Binary files a/Debug/source/i2str.obj and b/Debug/source/i2str.obj differ

diff --git a/Debug/source/notification.obj b/Debug/source/notification.obj
index af70b6c20808c757b3800cbb4789d27777c21b18..3f87299fcdb75f9b9cafd6b65b4ce96758369b06 100644 (file)
Binary files a/Debug/source/notification.obj and b/Debug/source/notification.obj differ

diff --git a/Debug/source/os_croutine.obj b/Debug/source/os_croutine.obj
index af3695409d7b3de3bfc12ec2b90833a94e6e39a5..c85791b703461b7686ee0b2392115cc68b62c38c 100644 (file)
Binary files a/Debug/source/os_croutine.obj and b/Debug/source/os_croutine.obj differ

diff --git a/Debug/source/os_heap.obj b/Debug/source/os_heap.obj
index c71f5678fb60e4ea842256caae967f92059d97d6..b967dc0b3ce8df4b0d5958f6d0da88ac08145874 100644 (file)
Binary files a/Debug/source/os_heap.obj and b/Debug/source/os_heap.obj differ

diff --git a/Debug/source/os_list.obj b/Debug/source/os_list.obj
index 61b9dde36a557848ad79509bc437fcd7f5d5632e..b968d5c8299dc67d5ceec0c0bcd3df9b89286669 100644 (file)
Binary files a/Debug/source/os_list.obj and b/Debug/source/os_list.obj differ

diff --git a/Debug/source/os_port.obj b/Debug/source/os_port.obj
index dc9e98913fad283bbb7afe3550f9cbe0aa0f16d7..f5ed6beff742f7f16690d16077da1660cef792a4 100644 (file)
Binary files a/Debug/source/os_port.obj and b/Debug/source/os_port.obj differ

diff --git a/Debug/source/os_queue.obj b/Debug/source/os_queue.obj
index 76a51722c2df05d2248f63a40fe11b03d698a6d1..1ccf20f50de4c8083b3903e7daf2a766fd6369a1 100644 (file)
Binary files a/Debug/source/os_queue.obj and b/Debug/source/os_queue.obj differ

diff --git a/Debug/source/os_tasks.obj b/Debug/source/os_tasks.obj
index 8f22924e5cfa0b9c9cb147dc08deeef8fb99921a..0c7696ac1d08f8c859a32b6b62dc1c9f966e478d 100644 (file)
Binary files a/Debug/source/os_tasks.obj and b/Debug/source/os_tasks.obj differ

diff --git a/Debug/source/os_timer.obj b/Debug/source/os_timer.obj
index 9c3bd9428d8efc1f8a7ce80896cb99e22a01516a..b4d484712ef891834120809fdfac046f2d979cfb 100644 (file)
Binary files a/Debug/source/os_timer.obj and b/Debug/source/os_timer.obj differ

diff --git a/Debug/source/pinmux.obj b/Debug/source/pinmux.obj
index 7ef8229ac55e9ac699aecd6e85bb00d3607987cd..4190352ce5ba0430fada06a2ed1c30c1f67f6faf 100644 (file)
Binary files a/Debug/source/pinmux.obj and b/Debug/source/pinmux.obj differ

diff --git a/Debug/source/sci.obj b/Debug/source/sci.obj
index fd4594793f573d86fa0f3174eb992720365d4eb6..dd320fef4d1de127f1f0a2b4f125ea0b7d02f892 100644 (file)
Binary files a/Debug/source/sci.obj and b/Debug/source/sci.obj differ

diff --git a/Debug/source/sci.pp b/Debug/source/sci.pp
index 0bdcbb2bae06c58cc3f47e0d7ff4a5496bc039e0..b61347326a6d45f8d1e7b6d9a2779d1c0beb4d3f 100644 (file)
--- a/Debug/source/sci.pp
+++ b/Debug/source/sci.pp
@@ -16,6 +16,8 @@ source/sci.obj: ../include/os_mpu_wrappers.h
 source/sci.obj: ../include/sys_core.h
 source/sci.obj: ../include/os_queue.h
 source/sci.obj: ../include/os_semphr.h
+source/sci.obj: ../include/os_task.h
+source/sci.obj: ../include/os_list.h
 
 ../source/sci.c: 
 ../include/sci.h: 
@@ -33,3 +35,5 @@ source/sci.obj: ../include/os_semphr.h
 ../include/sys_core.h: 
 ../include/os_queue.h: 
 ../include/os_semphr.h: 
+../include/os_task.h: 
+../include/os_list.h: 

diff --git a/Debug/source/sys_main.obj b/Debug/source/sys_main.obj
index 1ed5b73b39f2f6a3053c30bbccb5e705e3cd390e..c0ead36cc57280f0a89edf0ad4c5f408673283a3 100644 (file)
Binary files a/Debug/source/sys_main.obj and b/Debug/source/sys_main.obj differ

diff --git a/Debug/source/sys_main.pp b/Debug/source/sys_main.pp
index ea05f5e47db162a7c298b3201e4799b9d67a9b61..d48867feb7c2796f5a8f7d9aa5ea8e3685bf14a4 100644 (file)
--- a/Debug/source/sys_main.pp
+++ b/Debug/source/sys_main.pp
@@ -19,10 +19,10 @@ source/sys_main.obj: ../include/os_mpu_wrappers.h
 source/sys_main.obj: ../include/sys_core.h
 source/sys_main.obj: ../include/os_queue.h
 source/sys_main.obj: ../include/os_semphr.h
-source/sys_main.obj: ../include/sci.h
-source/sys_main.obj: ../include/gio.h
 source/sys_main.obj: ../include/os_task.h
 source/sys_main.obj: ../include/os_list.h
+source/sys_main.obj: ../include/sci.h
+source/sys_main.obj: ../include/gio.h
 
 ../source/sys_main.c: 
 ../include/sys_common.h: 
@@ -43,7 +43,7 @@ source/sys_main.obj: ../include/os_list.h
 ../include/sys_core.h: 
 ../include/os_queue.h: 
 ../include/os_semphr.h: 
-../include/sci.h: 
-../include/gio.h: 
 ../include/os_task.h: 
 ../include/os_list.h: 
+../include/sci.h: 
+../include/gio.h: 

diff --git a/Debug/source/sys_phantom.obj b/Debug/source/sys_phantom.obj
index 43b9b5ddcb900440600e8a32589b1b5804b7249e..4048316717364059880fbd561c4fc8824a903adb 100644 (file)
Binary files a/Debug/source/sys_phantom.obj and b/Debug/source/sys_phantom.obj differ

diff --git a/Debug/source/sys_selftest.obj b/Debug/source/sys_selftest.obj
index a48ea9a46a9c727128b7eeef0ff397d304885795..295a639139ad72b2229803633c3cbe92a26a72eb 100644 (file)
Binary files a/Debug/source/sys_selftest.obj and b/Debug/source/sys_selftest.obj differ

diff --git a/Debug/source/sys_startup.obj b/Debug/source/sys_startup.obj
index 29406c4ea2c3311eabef47542e7a7d869864d0de..6bde14a25758407f3fe0450b56f207e785dcb132 100644 (file)
Binary files a/Debug/source/sys_startup.obj and b/Debug/source/sys_startup.obj differ

diff --git a/Debug/source/system.obj b/Debug/source/system.obj
index f41efb0e77b1f6fc025c7257af4d0827dc35229a..f2f47dc324418e9dae71f8210d06ab6f93468a49 100644 (file)
Binary files a/Debug/source/system.obj and b/Debug/source/system.obj differ

diff --git a/include/cmdio_tisci.h b/include/cmdio_tisci.h
index 2b5fd1dbf1e3364fefb88c4e30eba5e0b29297f9..07bff2cf5f05f194d48496301210ba33b8557eed 100644 (file)
--- a/include/cmdio_tisci.h
+++ b/include/cmdio_tisci.h
@@ -10,20 +10,23 @@
 #ifndef CMDIO_BUFFER_H_
 #define CMDIO_BUFFER_H_
 
-#define MAX_BUFFER_LEN 128
+#define MAX_BUFFER_LEN 32
 #define errBUFFER_NOT_INITIALIZED -6
 
+#define BUF_TRANSFER_IN_PROGRESS 1
+
 #include "cmd_proc.h"
 #include "FreeRTOS.h"
 #include "os_queue.h"
 #include "os_semphr.h"
+#include "os_task.h"
 #include "sci.h"
 
 
 typedef struct {
        xQueueHandle buf;
        xSemaphoreHandle mutex;
-       uint8_t initialized;
+       uint8_t flags;
 } tBuffer;
 
 
@@ -33,10 +36,9 @@ void initIoBuffer();
 
 /**    Print string into an output buffer in a not blocking way.
  * @param[in]  string  String to be printed into output buffer
- * @param[in]  length  number of characters to be printed
  * @return     pdPASS when OK; errQUEUE_FULL when buffer is full, errBUFFER_NOT_INITIALIZED when initIoBuffer function was not called before
  */
-portBASE_TYPE print(const uint8_t * string, uint32_t length);
+portBASE_TYPE print(const uint8_t * string);
 
 /**    Read character from an input buffer in a blocking way
  * @param[out] ch      Character read from buffer
@@ -54,10 +56,9 @@ portBASE_TYPE genericRead(tBuffer* buffer, uint8_t * ch);
 /**    Print string to a buffer. Let it be blocking or nonblocking in case the buffer is full.
  * @param[in]  buffer  Pointer to buffer from which will be read.
  * @param[in]  string  String to be printed into buffer
- * @param[in]  length  number of characters to be printed
  * @return     pdPASS when OK; errQUEUE_FULL when buffer is full and ran out of block time, errBUFFER_NOT_INITIALIZED when initIoBuffer function was not called before.
  */
-portBASE_TYPE genericPrint(tBuffer* buffer, const uint8_t * string, uint32_t length);
+portBASE_TYPE genericPrint(tBuffer* buffer, const uint8_t * string);
 
 /**    Makes input buffer empty
  * @return pdPass when success, errBUFFER_NOT_INITIALIZED when initIoBuffer function was not called before

diff --git a/source/cmd_proc_freertos_tms570.c b/source/cmd_proc_freertos_tms570.c
index c31c6fd1564b318c8e1b5358b6b94bfe8b35cee6..43ad5b9e944714f6549ba23cb29dde149f0121f9 100644 (file)
--- a/source/cmd_proc_freertos_tms570.c
+++ b/source/cmd_proc_freertos_tms570.c
@@ -23,21 +23,21 @@ void initCmdProc(unsigned portBASE_TYPE priority, uint8_t * introText, uint8_t *
                strcpy((char *)prompt, (const char*)promptText);
        }
        int taskRetVal;
-       if ((taskRetVal = xTaskCreate(processCmd, (const signed char *)"processCmd", 200, NULL, priority, processCmdHandler)) != pdPASS) {
+       if ((taskRetVal = xTaskCreate(processCmd, (const signed char *)"processCmd", 1000, NULL, priority, processCmdHandler)) != pdPASS) {
                uint8_t taskCreateError[]="FreeRTOS: Creating task processCmd failed. Error code: ";
-               print(taskCreateError, strlen((char*)taskCreateError));
+               print(taskCreateError);
                char buf[20];
                i2str(buf, taskRetVal, 1, 0);
-               print((uint8_t *)buf, strlen(buf));
-               print((uint8_t *)"\r\n", 2);
+               print((uint8_t *)buf);
+               print((uint8_t *)"\r\n");
                /* An error occurred, block program */
                while(1)
                        ;
        }
        if (introText != NULL)
-               print((uint8_t *)introText, strlen((char *)introText));
+               print((uint8_t *)introText);
        if (prompt != NULL)
-               print((uint8_t *)prompt, strlen((char *)prompt));
+               print((uint8_t *)prompt);
        sciReceive(sciREG, 1, NULL);
 }
 
@@ -45,7 +45,7 @@ void processCmd(void *pvParameters ) {
        for (;;) {
                cmd_processor_run(&cmd_io_std_line, cmd_list_main);
                if (prompt != NULL)
-                       print((uint8_t *)prompt, strlen((char*)prompt));
+                       print((uint8_t *)prompt);
        }
 }
 

diff --git a/source/cmdio_tisci.c b/source/cmdio_tisci.c
index 2c99a07f105cf74acb5db5bc9a552178be559c5b..a632ebbe975dd51ded38ff04245cb79d19d4ceaf 100644 (file)
--- a/source/cmdio_tisci.c
+++ b/source/cmdio_tisci.c
@@ -16,37 +16,44 @@ tBuffer inBuffer;
 void initIoBuffer() {
        outBuffer.buf = xQueueCreate(MAX_BUFFER_LEN, sizeof(uint8_t));
        outBuffer.mutex = xSemaphoreCreateMutex();
-       outBuffer.initialized = 1;
+       outBuffer.flags = 0;
        inBuffer.buf = xQueueCreate(MAX_BUFFER_LEN, sizeof(uint8_t));
        inBuffer.mutex = xSemaphoreCreateMutex();
-       inBuffer.initialized = 1;
+       outBuffer.flags = 0;
 }
-portBASE_TYPE print(const uint8_t * string, uint32_t length) {
-       return genericPrint(&outBuffer, string, length);
+portBASE_TYPE print(const uint8_t * string) {
+       return genericPrint(&outBuffer, string);
 }
 portBASE_TYPE read(uint8_t * ch) {
        return genericRead(&inBuffer, ch);
 }
 portBASE_TYPE genericRead(tBuffer* buffer, uint8_t * ch) {
-       if (!buffer->initialized) return errBUFFER_NOT_INITIALIZED;
+       if (buffer->buf == NULL) return errBUFFER_NOT_INITIALIZED;
        portBASE_TYPE ret;
        ret = xQueueReceive(buffer->buf, ch, portMAX_DELAY);
        return ret;
 }
-portBASE_TYPE genericPrint(tBuffer* buffer, const uint8_t * string, uint32_t length) {
-       if (!buffer->initialized) return errBUFFER_NOT_INITIALIZED;
-       uint32_t i = 0;
+portBASE_TYPE genericPrint(tBuffer* buffer, const uint8_t * string) {
+       if (buffer->buf == NULL) return errBUFFER_NOT_INITIALIZED;
        portBASE_TYPE ret = pdPASS;
        xSemaphoreTake(buffer->mutex, portMAX_DELAY);
-       while (i < length && string[i] != '\0') {
-               if (xQueueSend(buffer->buf, (void*)&string[i], 0) == pdPASS) {
-                       i++;
+       while (*string != '\0') {
+               if (!buffer->flags & BUF_TRANSFER_IN_PROGRESS) {
+                               taskENTER_CRITICAL();
+                               if (!buffer->flags & BUF_TRANSFER_IN_PROGRESS) {
+                                       buffer->flags |= BUF_TRANSFER_IN_PROGRESS;
+                                       sciREG->SETINT = SCI_TX_INT;    // Start new transfer by sending first byte
+                                       sciREG->TD     = *string++;
+                               }
+                               taskEXIT_CRITICAL();
+                               continue;
+               }
+               if ((ret = xQueueSend(buffer->buf, (void*)string++, 0) )!= pdPASS) {
+                       break; // Some critical error occured
                }
-               else sciSend(sciREG, 1, NULL);
        }
-       sciSend(sciREG, 1, NULL);
        xSemaphoreGive(buffer->mutex);
-       return ret;
+       return ret ;
 }
 portBASE_TYPE clearInputBuffer() {
        return clearBuffer(&inBuffer);
@@ -55,15 +62,17 @@ portBASE_TYPE clearOutputBuffer() {
        return clearBuffer(&outBuffer);
 }
 portBASE_TYPE clearBuffer(tBuffer * buffer) {
-       if (!buffer->initialized) return errBUFFER_NOT_INITIALIZED;
+       if (buffer->buf == NULL) return errBUFFER_NOT_INITIALIZED;
        while ((xQueueReceive(buffer->buf, NULL, 0)) != errQUEUE_EMPTY) // Delete content of queue
                ;
        return pdPASS;
 }
 
 int tisci_putc(cmd_io_t *cmd_io, int ch) {
-       uint8_t c = (uint8_t)ch;
-       if (print((uint8_t *)&c, 1) != pdPASS) {
+       uint8_t c[2];
+       c[0] =(uint8_t)ch;
+       c[1] = (uint8_t)'\0';
+       if (print((uint8_t *)&c) != pdPASS) {
                return 0;
        }
     return 1;
@@ -78,7 +87,7 @@ int tisci_getc(cmd_io_t *cmd_io) {
 }
 int tisci_write(cmd_io_t *cmd_io, const void *buf, int count) {
     const char *tmpBuf = buf;
-       if (print((uint8_t *)tmpBuf, count) != pdPASS)
+       if (print((uint8_t *)tmpBuf) != pdPASS)
                return 0;
     return count;
 }

diff --git a/source/commands.c b/source/commands.c
index 5736fd50e32bb5c9cfc02f8b44b9061bbb093f80..a5340c9d980c4cbdb12f6439c063b800fa59a3d7 100644 (file)
--- a/source/commands.c
+++ b/source/commands.c
@@ -28,19 +28,19 @@ int cmd_do_testopchar(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]
   if(opchar<0) return opchar;
   char str[] = {"\r\ncmd_do_testopchar called\r\nparam[0]="};
 
-  print((uint8_t *)str, strlen(str));
-  print((uint8_t *)param[0], strlen(param[0]));
-  print((uint8_t *)"\r\nparam[1]=", 11);
-  print((uint8_t *)param[1], strlen(param[1]));
-  print((uint8_t *)"\r\nparam[2]=", 11);
-  print((uint8_t *)param[2], strlen(param[2]));
-  print((uint8_t *)"\r\nparam[3]=", 11);
-  print((uint8_t *)param[3], strlen(param[3]));
-  print((uint8_t *)"\r\nopchar=", 9);
+  print((uint8_t *)str);
+  print((uint8_t *)param[0]);
+  print((uint8_t *)"\r\nparam[1]=");
+  print((uint8_t *)param[1]);
+  print((uint8_t *)"\r\nparam[2]=");
+  print((uint8_t *)param[2]);
+  print((uint8_t *)"\r\nparam[3]=");
+  print((uint8_t *)param[3]);
+  print((uint8_t *)"\r\nopchar=");
   char opcharBuf[4];
   i2str(opcharBuf, opchar, 1, 10);
-  print((uint8_t *)opcharBuf, strlen(opcharBuf));
-  print((uint8_t *)"\r\n", 2);
+  print((uint8_t *)opcharBuf);
+  print((uint8_t *)"\r\n");
   return 0;
 }
 
@@ -49,13 +49,13 @@ int cmd_do_testparam(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 
          char str[] = {"cmd_do_testparam called\r\nparam[0]="};
 
-         print((uint8_t *)str, strlen(str));
-         print((uint8_t *)param[0], strlen(param[0]));
-         print((uint8_t *)"\r\nparam[1]=", 11);
-         print((uint8_t *)param[1], strlen(param[1]));
-         print((uint8_t *)"\r\nparam[2]=", 11);
-         print((uint8_t *)param[2], strlen(param[2]));
-         print((uint8_t *)"\r\n", 2);
+         print((uint8_t *)str);
+         print((uint8_t *)param[0]);
+         print((uint8_t *)"\r\nparam[1]=");
+         print((uint8_t *)param[1]);
+         print((uint8_t *)"\r\nparam[2]=");
+         print((uint8_t *)param[2]);
+         print((uint8_t *)"\r\n");
 
          return 0;
 }
@@ -68,7 +68,7 @@ int cmd_do_testerror(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 int cmd_do_test(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 {
        char str[] = {"This is the simplest command\r\n"};
-       print((uint8_t *)str, strlen(str));
+       print((uint8_t *)str);
 
        return 0;
 }
@@ -77,6 +77,13 @@ int cmd_do_testcmdio(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 {
     cmd_io_puts(cmd_io, "The first line of text\r\n");
     cmd_io_puts(cmd_io, "The second line of text\r\n");
+    char str[1000];
+    int i;
+    for (i = 0; i < 1000; i++) {
+       str[i] = 'q';
+    }
+    str[999]='\0';
+    print((uint8_t *)str);
     /* Only ED_LINE_CHARS character can be sent. */
     return 0;
 }

diff --git a/source/sci.c b/source/sci.c
index ce3d08b4c450e67285e1559358c71defa807d49a..8cd0210ec791be73a18ff83df9de2b9be73d91fe 100644 (file)
--- a/source/sci.c
+++ b/source/sci.c
@@ -114,7 +114,7 @@ void sciInit(void)
                     | (0);  /* Break detect */\r
 \r
     /** - inialise global transfer variables */\r
-    g_sciTransfer[0].mode   = 0 << 8;\r
+    g_sciTransfer[0].mode   = 1 << 8;\r
     g_sciTransfer[0].length = 0;\r
 \r
     /** - Finaly start SCI */\r
@@ -233,25 +233,6 @@ void sciSend(sciBASE_t *sci, uint32_t length, uint8_t *data)
     int index = sci == sciREG ? 0 : 1;\r
 \r
 /* USER CODE BEGIN (11) */\r
-    /* Using interrupt, does not work. Sometimes a character is lost */\r
-//    if ((g_sciTransfer[index].mode & SCI_TX_INT) != 0)\r
-//    {\r
-        /* start transmit by sending first byte */\r
-//     uint8_t byte = 0;\r
-//     if (xQueueReceiveFromISR(outBuffer.buf, (uint8_t *)&byte, NULL) == pdPASS) {\r
-//            sci->TD     = byte;\r
-//            sci->SETINT = SCI_TX_INT;\r
-//     }\r
-//    }\r
-//   else\r
-//    {\r
-        /* send the data *///\r
-//    while (length-- > 0)\r
-//        {\r
-//            while ((sci->FLR & SCI_TX_INT) == 0) { /* wait */ };\r
-//            sci->TD = *data++;\r
-//        }\r
-//    }\r
 /* USER CODE END */\r
 \r
     if ((g_sciTransfer[index].mode & SCI_TX_INT) != 0)\r
@@ -268,12 +249,10 @@ void sciSend(sciBASE_t *sci, uint32_t length, uint8_t *data)
     else\r
     {\r
         /* send the data */\r
-        while (xQueueIsQueueEmptyFromISR(outBuffer.buf) != pdTRUE)\r
+        while (length-- > 0)\r
         {\r
             while ((sci->FLR & SCI_TX_INT) == 0) { /* wait */ };\r
-            uint8_t byte;\r
-            xQueueReceiveFromISR(outBuffer.buf, (void *)&byte, NULL);\r
-            sci->TD = byte;\r
+            sci->TD = *data++;\r
         }\r
     }\r
 \r
@@ -363,7 +342,7 @@ void sciReceive(sciBASE_t *sci, uint32_t length, uint8_t *data)
 /* USER CODE BEGIN (16) */\r
     if (sci->SETINT & SCI_RX_INT)\r
     {\r
-        /* clear error flags */\r
+        /* We are in iterrupt mode, clear error flags */\r
         sci->FLR = SCI_FE_INT | SCI_OE_INT | SCI_PE_INT;\r
 \r
     }\r
@@ -377,25 +356,6 @@ void sciReceive(sciBASE_t *sci, uint32_t length, uint8_t *data)
     }\r
 /* USER CODE END */\r
 \r
-    if (sci->SETINT & SCI_RX_INT)\r
-    {\r
-        /* we are in interrupt mode */\r
-        int index = sci == sciREG ? 0 : 1;\r
-        \r
-        /* clear error flags */\r
-        sci->FLR = SCI_FE_INT | SCI_OE_INT | SCI_PE_INT;\r
-\r
-        g_sciTransfer[index].length = length;\r
-        g_sciTransfer[index].data   = data;\r
-    }\r
-    else\r
-    {   \r
-        while (length-- > 0)\r
-        {\r
-            while ((sci->FLR & SCI_RX_INT) == 0) { /* wait */ };\r
-            *data++ = sci->RD;\r
-        }\r
-    }\r
 /* USER CODE BEGIN (17) */\r
 /* USER CODE END */\r
 }\r
@@ -534,38 +494,23 @@ void sciHighLevelInterrupt(void)
 \r
     case 12:\r
         /* transmit */\r
-       /* using interrupt, does not work properly, sometimes a character is lost */\r
- /*    if (xQueueIsQueueEmptyFromISR(outBuffer.buf) == pdTRUE) {\r
-               sciREG->CLRINT = SCI_TX_INT;\r
-               sciNotification(sciREG, SCI_TX_INT);\r
-       }\r
-       else {\r
-               uint8_t byte = 0;\r
-               xQueueReceiveFromISR(outBuffer.buf, (uint8_t *)&byte, NULL);\r
-               while (sciIsTxReady(sciREG) == 0)\r
-                       ;\r
-                       sciREG->TD     = byte;\r
+       {\r
+                       uint8_t byte = 0;\r
+                       if (xQueueReceiveFromISR(outBuffer.buf, (uint8_t *)&byte, NULL) == errQUEUE_EMPTY) {\r
+                               sciREG->CLRINT = SCI_TX_INT;\r
+                               outBuffer.flags &= ~BUF_TRANSFER_IN_PROGRESS;\r
+                       }\r
+                       else {\r
+                               sciREG->TD     = byte;\r
+                       }\r
        }\r
- */\r
-        /* transmit */\r
-        if (--g_sciTransfer[0].length > 0)\r
-        {\r
-            sciREG->TD = *g_sciTransfer[0].data++;\r
-        }\r
-        else\r
-        {\r
-            sciREG->CLRINT = SCI_TX_INT;\r
-            sciNotification(sciREG, SCI_TX_INT);\r
-        }\r
-        break;\r
-\r
+       break;\r
      default:\r
         /* phantom interrupt, clear flags and return */\r
         sciREG->FLR = ~sciREG->SETINTLVL & 0x07000303;\r
         break;\r
     }\r
 /* USER CODE END */\r
-\r
 /* USER CODE BEGIN (27) */\r
 /* USER CODE END */\r
 }\r
@@ -578,6 +523,7 @@ void sciHighLevelInterrupt(void)
 void sciLowLevelInterrupt(void)\r
 {\r
     uint32_t vec = sciREG->INTVECT1;\r
+\r
 /* USER CODE BEGIN (28) */\r
 /* USER CODE END */\r
 \r

diff --git a/source/sys_main.c b/source/sys_main.c
index 9dd707d824d1bce77892ed16f638fa29666242e3..0d8aa25e6ec816397c273b64ee71ff5257892506 100644 (file)
--- a/source/sys_main.c
+++ b/source/sys_main.c
@@ -42,7 +42,7 @@ void main(void)
 /* USER CODE BEGIN (3) */\r
        sciInit();\r
        _enable_IRQ();\r
-       initCmdProc(1, (uint8_t*)"\r\nType commands\r\n", (uint8_t *)"--> ");\r
+       initCmdProc(1, (uint8_t*)"\r\nType commands\r\n", (uint8_t *)"\r\n--> ");\r
 \r
        vTaskStartScheduler();\r
        //We should never get here\r