Changeset 17

Show
Ignore:
Timestamp:
08/10/09 11:12:44 (15 years ago)
Author:
phil
Message:

adaptated example for LED flash to ETT eval board with 1 LED flashing,
changed portable.h to rowley setup
etc.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h

    r14 r17  
    5050 
    5151#include <stdio.h> 
    52 #include <targets/LPC2368.h> 
     52#include <targets/LPC23xx.h> 
    5353#define vPortYieldProcessor swi_handler 
    5454 
     
    7070 
    7171/* Value to use on rev 'A' and newer devices. */ 
    72 //#define configPINSEL2_VALUE         0x50150105 
     72#define configPINSEL2_VALUE   0x50150105 
    7373 
    7474#ifndef configPINSEL2_VALUE 
     
    130130 
    131131 
    132 #define VICVectAddr    VICAddress 
    133 #define VICVectCntl4 VICVectPriority4 
     132//#define VICVectAddr    VICAddress 
     133//#define VICVectCntl4 VICVectPriority4 
    134134typedef struct 
    135135{ 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c

    r14 r17  
    2020 ************************************************************************/ 
    2121 
    22 #include <targets/LPC2368.h> 
     22#include <targets/LPC23xx.h> 
    2323#include "portlcd.h" 
    2424#include "FreeRTOS.h" 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c

    r14 r17  
    5353 
    5454#define partstFIRST_IO                  ( ( unsigned portLONG ) 0x01 ) 
    55 #define partstNUM_LEDS                  ( 8
     55#define partstNUM_LEDS                  ( 2
    5656#define partstALL_OUTPUTS_OFF   ( ( unsigned portLONG ) 0xff ) 
     57 
     58// Pin I/O LED Control Maskbit 
     59#define  LED1       0x02000000                                                          // P3.25(0000 00x0 0000 0000 0000 0000 0000 0000) 
     60#define  LED2       0x04000000                                                          // P3.26(0000 0x00 0000 0000 0000 0000 0000 0000) 
     61 
     62#define  LED1_ON()  FIO3CLR = LED1                                              // LED1 Pin = 0 (ON LED) 
     63#define  LED1_OFF() FIO3SET = LED1                                                      // LED1 Pin = 1 (OFF LED) 
     64#define  LED2_ON()  FIO3CLR = LED2                                                      // LED2 Pin = 0 (ON LED) 
     65#define  LED2_OFF() FIO3SET = LED2                                                      // LED2 Pin = 1 (OFF LED) 
     66 
     67int led_1_state; 
     68int led_2_state; 
     69 
    5770 
    5871/*----------------------------------------------------------- 
     
    6275void vParTestInitialise( void ) 
    6376{ 
    64         PINSEL10 = 0; 
    65         FIO2DIR  = 0x000000FF; 
    66         FIO2MASK = 0x00000000; 
    67         FIO2CLR  = 0xFF; 
    68         SCS |= (1<<0); //fast mode for port 0 and 1 
    6977 
    70     FIO2CLR = partstALL_OUTPUTS_OFF; 
     78 // Config Pin GPIO3[26:25]    
     79  PINSEL7  &= 0xFFC3FFFF;                                                                       // P3[26:25] = GPIO Function(xxxx xxxx xx00 00xx xxxx xxxx xxxx xxxx) 
     80  PINMODE7 &= 0xFFC3FFFF;                                                                       // Enable Puul-Up on P3[26:25] 
     81    
     82  FIO3DIR  |= LED1;                                                                     // Set GPIO-3[26:25] = Output(xxxx x11x xxxx xxxx xxxx xxxx xxxx xxxx) 
     83  FIO3DIR  |= LED2; 
     84  LED1_OFF();                                                                                           // Default LED Status 
     85  LED2_OFF(); 
     86 
     87//      PINSEL10 = 0; 
     88//      FIO2DIR  = 0x000000FF; 
     89//      FIO2MASK = 0x00000000; 
     90//      FIO2CLR  = 0xFF; 
     91//      SCS |= (1<<0); //fast mode for port 0 and 1 
     92 
     93//    FIO2CLR = partstALL_OUTPUTS_OFF; 
    7194} 
    7295/*-----------------------------------------------------------*/ 
     
    7598{ 
    7699unsigned portLONG ulLED = partstFIRST_IO; 
    77  
     100#if 0 
    78101        if( uxLED < partstNUM_LEDS ) 
    79102        { 
     
    91114                } 
    92115        } 
     116#endif 
    93117} 
    94118/*-----------------------------------------------------------*/ 
     
    98122unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState; 
    99123 
     124 
     125    if (led_1_state == 0) 
     126    { 
     127      LED1_ON(); 
     128 
     129      led_1_state = 1; 
     130    }  
     131      else  
     132    { 
     133      LED1_OFF(); 
     134      led_1_state = 0; 
     135    } 
     136 
     137 
     138#if 0 
    100139        if( uxLED < partstNUM_LEDS ) 
    101140        { 
     
    115154                } 
    116155        }        
     156#endif 
    117157} 
    118158 
     
    120160unsigned portBASE_TYPE uxParTextGetLED( unsigned portBASE_TYPE uxLED ) 
    121161{ 
     162#if 0 
    122163unsigned portLONG ulLED = partstFIRST_IO; 
    123164     
     
    125166 
    126167    return ( FIO2PIN & ulLED ); 
     168#endif 
     169        return 0; 
    127170} 
    128171 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp

    r14 r17  
    11<!DOCTYPE CrossStudio_Project_File> 
    2 <solution version="1" Name="RTOSDemo" > 
    3   <project Name="RTOSDemo" > 
    4     <configuration arm_target_loader_parameter="12000000" Target="LPC2368" arm_target_flash_loader_file_path="$(StudioDir)/targets/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" property_groups_file_path="$(StudioDir)/targets/Philips_LPC210X/propertyGroups23xx.xml" oscillator_frequency="12MHz" linker_memory_map_file="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" gcc_entry_point="reset_handler" build_remove_unused_symbols="No" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" arm_architecture="v4T" linker_additional_files="$(StudioDir)/lib/liblpc2000$(LibExt)$(LIB)" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip" project_directory="" link_include_startup_code="No" gcc_optimization_level="Level 1" arm_target_flash_loader_type="LIBMEM RPC Loader" project_type="Executable" c_additional_options="" linker_printf_fmt_level="long" arm_linker_stack_size="10" Name="Common" c_system_include_directories="$(StudioDir)\include" arm_target_debug_interface_type="ARM7TDI" arm_core_type="ARM7TDMI-S" arm_simulator_memory_simulation_filename="$(StudioDir)/targets/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_linker_svc_stack_size="1024" /> 
    5     <configuration linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()" Name="RAM" Placement="RAM" /> 
    6     <configuration arm_target_flash_loader_file_path="$(StudioDir)/targets/Philips_LPC210X/Release/Loader_lpc2300.elf" linker_section_placement_file="$(StudioDir)/targets/flash_placement.xml" target_reset_script="FLASHReset()" arm_target_flash_loader_type="LIBMEM RPC Loader" Name="Flash" Placement="Flash" /> 
    7     <folder Name="Demo Source" > 
    8       <configuration filter="c;cpp;cxx;cc;h;s;asm;inc" Name="Common" /> 
    9       <file file_name="main.c" Name="main.c" /> 
    10       <file file_name="LCD/portlcd.c" Name="portlcd.c" > 
    11         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     2<solution Name="RTOSDemo" version="2"> 
     3  <project Name="RTOSDemo"> 
     4    <configuration Name="Common" Target="LPC2368" arm_architecture="v4T" arm_core_type="ARM7TDMI-S" arm_linker_stack_size="10" arm_linker_svc_stack_size="1024" arm_simulator_memory_simulation_filename="$(TargetsDir)/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" arm_target_debug_interface_type="ARM7TDI" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" arm_target_loader_parameter="12000000" build_remove_unused_symbols="No" c_additional_options="" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" c_system_include_directories="$(StudioDir)/include;$(PackagesDir)/include" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip" gcc_entry_point="reset_handler" gcc_optimization_level="None" link_include_startup_code="No" linker_additional_files="$(PackagesDir)/lib/liblpc2000$(LibExt)$(LIB)" linker_memory_map_file="$(TargetsDir)/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" linker_printf_fmt_level="long" oscillator_frequency="12MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/Philips_LPC210X/propertyGroups23xx.xml"/> 
     5    <configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()"/> 
     6    <configuration Name="Flash" Placement="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_section_placement_file="$(StudioDir)/targets/flash_placement.xml" target_reset_script="FLASHReset()"/> 
     7    <folder Name="Demo Source"> 
     8      <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc"/> 
     9      <file Name="main.c" file_name="main.c"> 
     10        <configuration Name="Common" gcc_optimization_level="None"/> 
    1211      </file> 
    13       <file file_name="../Common/Minimal/blocktim.c" Name="blocktim.c"
    14         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     12      <file Name="portlcd.c" file_name="LCD/portlcd.c"
     13        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    1514      </file> 
    16       <file file_name="../Common/Minimal/integer.c" Name="integer.c"
    17         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     15      <file Name="blocktim.c" file_name="../Common/Minimal/blocktim.c"
     16        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    1817      </file> 
    19       <file file_name="../Common/Minimal/BlockQ.c" Name="BlockQ.c"
    20         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     18      <file Name="integer.c" file_name="../Common/Minimal/integer.c"
     19        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    2120      </file> 
    22       <file file_name="ParTest/ParTest.c" Name="ParTest.c"
    23         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     21      <file Name="BlockQ.c" file_name="../Common/Minimal/BlockQ.c"
     22        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    2423      </file> 
    25       <file file_name="../Common/Minimal/flash.c" Name="flash.c"
    26         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     24      <file Name="ParTest.c" file_name="ParTest/ParTest.c"
     25        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    2726      </file> 
    28       <file file_name="webserver/EMAC_ISR.c" Name="EMAC_ISR.c" > 
    29         <configuration arm_instruction_set="ARM" Name="THUMB" /> 
    30         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     27      <file Name="flash.c" file_name="../Common/Minimal/flash.c"> 
     28        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
    3129      </file> 
    32       <file file_name="webserver/emac.c" Name="emac.c" > 
    33         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    34         <configuration asm_additional_options="" Name="Common" /> 
     30      <file Name="EMAC_ISR.c" file_name="webserver/EMAC_ISR.c"> 
     31        <configuration Name="THUMB" arm_instruction_set="ARM"/> 
     32        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     33        <configuration Name="Common" c_enforce_ansi_checking="No"/> 
    3534      </file> 
    36       <file file_name="../Common/Minimal/death.c" Name="death.c" /> 
    37       <file file_name="../Common/Minimal/PollQ.c" Name="PollQ.c" /> 
    38       <file file_name="../Common/Minimal/semtest.c" Name="semtest.c" /> 
    39     </folder> 
    40     <folder Name="System Files" > 
    41       <file file_name="$(StudioDir)/source/crt0.s" Name="crt0.s" /> 
    42       <file file_name="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC230X_Startup.s" Name="Philips_LPC230X_Startup.s" /> 
    43       <file file_name="$(StudioDir)/targets/Philips_LPC210X/LPC230x.c" Name="LPC230x.c" /> 
    44       <file file_name="$(StudioDir)/targets/Philips_LPC210X/Philips_LPC210X_Target.js" Name="Philips_LPC210X_Target.js" > 
    45         <configuration Name="Common" file_type="Reset Script" /> 
     35      <file Name="emac.c" file_name="webserver/emac.c"> 
     36        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     37        <configuration Name="Common" asm_additional_options=""/> 
    4638      </file> 
    47       <file file_name="$(StudioDir)/targets/Philips_LPC210X/VIC_PL192.c" Name="VIC_PL192.c" /> 
    48       <file file_name="$(StudioDir)/targets/Philips_LPC210X/VIC_PL192_irq_handler.s" Name="VIC_PL192_irq_handler.s" /> 
    49     </folder> 
    50     <folder Name="FreeRTOS.org Source" > 
    51       <file file_name="../../Source/tasks.c" Name="tasks.c" /> 
    52       <file file_name="../../Source/list.c" Name="list.c" /> 
    53       <file file_name="../../Source/queue.c" Name="queue.c" /> 
    54       <file file_name="../../Source/portable/GCC/ARM7_LPC23xx/port.c" Name="port.c" /> 
    55       <file file_name="../../Source/portable/GCC/ARM7_LPC23xx/portISR.c" Name="portISR.c" > 
    56         <configuration arm_instruction_set="ARM" Name="Common" /> 
    57       </file> 
    58       <file file_name="../../Source/portable/MemMang/heap_2.c" Name="heap_2.c" /> 
    59     </folder> 
    60     <configuration linker_scanf_fmt_level="int" linker_keep_symbols="_vectors" c_preprocessor_definitions="" gcc_optimization_level="Level 1" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_scanf_character_group_matching_enabled="No" linker_printf_fmt_level="int" Name="ARM Flash Debug" /> 
    61     <folder Name="uIP Source" > 
    62       <file file_name="webserver/uIP_Task.c" Name="uIP_Task.c" > 
    63         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    64       </file> 
    65       <file file_name="webserver/httpd.c" Name="httpd.c" > 
    66         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    67       </file> 
    68       <file file_name="webserver/httpd-cgi.c" Name="httpd-cgi.c" > 
    69         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    70       </file> 
    71       <file file_name="webserver/httpd-fs.c" Name="httpd-fs.c" > 
    72         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    73       </file> 
    74       <file file_name="webserver/http-strings.c" Name="http-strings.c" > 
    75         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    76       </file> 
    77       <file file_name="../Common/ethernet/uIP/uip-1.0/uip/uip_arp.c" Name="uip_arp.c" > 
    78         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    79       </file> 
    80       <file file_name="../Common/ethernet/uIP/uip-1.0/uip/psock.c" Name="psock.c" > 
    81         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    82       </file> 
    83       <file file_name="../Common/ethernet/uIP/uip-1.0/uip/timer.c" Name="timer.c" > 
    84         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
    85       </file> 
    86       <file file_name="../Common/ethernet/uIP/uip-1.0/uip/uip.c" Name="uip.c" > 
    87         <configuration build_exclude_from_build="No" Name="ARM Flash Debug" /> 
     39      <file Name="death.c" file_name="../Common/Minimal/death.c"/> 
     40      <file Name="PollQ.c" file_name="../Common/Minimal/PollQ.c"/> 
     41      <file Name="semtest.c" file_name="../Common/Minimal/semtest.c"> 
     42        <configuration Name="Common" c_enforce_ansi_checking="No"/> 
    8843      </file> 
    8944    </folder> 
    90     <configuration c_preprocessor_definitions="THUMB_INTERWORK" Name="THUMB" /> 
    91     <configuration c_preprocessor_definitions="STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size" Name="ARM Flash Release" /> 
    92     <configuration arm_linker_fiq_stack_size="0" arm_linker_stack_size="0" Name="THUMB Flash Debug" arm_linker_svc_stack_size="512" arm_linker_heap_size="0" /> 
     45    <folder Name="System Files"> 
     46      <file Name="crt0.s" file_name="$(StudioDir)/source/crt0.s"/> 
     47      <file Name="Philips_LPC230X_Startup.s" file_name="$(TargetsDir)/Philips_LPC210X/Philips_LPC230X_Startup.s"/> 
     48      <file Name="LPC230x.c" file_name="$(TargetsDir)/Philips_LPC210X/LPC230x.c"/> 
     49      <file Name="Philips_LPC210X_Target.js" file_name="$(TargetsDir)/Philips_LPC210X/Philips_LPC210X_Target.js"> 
     50        <configuration Name="Common" file_type="Reset Script"/> 
     51      </file> 
     52      <file Name="VIC_PL192.c" file_name="$(TargetsDir)/Philips_LPC210X/VIC_PL192.c"/> 
     53      <file Name="VIC_PL192_irq_handler.s" file_name="$(TargetsDir)/Philips_LPC210X/VIC_PL192_irq_handler.s"/> 
     54    </folder> 
     55    <folder Name="FreeRTOS.org Source"> 
     56      <file Name="tasks.c" file_name="../../Source/tasks.c"> 
     57        <configuration Name="Common" c_enforce_ansi_checking="No"/> 
     58      </file> 
     59      <file Name="list.c" file_name="../../Source/list.c"/> 
     60      <file Name="queue.c" file_name="../../Source/queue.c"/> 
     61      <file Name="port.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/port.c"/> 
     62      <file Name="portISR.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/portISR.c"> 
     63        <configuration Name="Common" arm_instruction_set="ARM"/> 
     64      </file> 
     65      <file Name="heap_2.c" file_name="../../Source/portable/MemMang/heap_2.c"/> 
     66    </folder> 
     67    <configuration Name="ARM Flash Debug" arm_target_flash_loader_type="LIBMEM RPC Loader" c_enforce_ansi_checking="No" c_preprocessor_definitions="" gcc_optimization_level="Level 1" linker_keep_symbols="_vectors" linker_printf_fmt_level="int" linker_scanf_character_group_matching_enabled="No" linker_scanf_fmt_level="int"/> 
     68    <folder Name="uIP Source"> 
     69      <file Name="uIP_Task.c" file_name="webserver/uIP_Task.c"> 
     70        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     71      </file> 
     72      <file Name="httpd.c" file_name="webserver/httpd.c"> 
     73        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     74      </file> 
     75      <file Name="httpd-cgi.c" file_name="webserver/httpd-cgi.c"> 
     76        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     77      </file> 
     78      <file Name="httpd-fs.c" file_name="webserver/httpd-fs.c"> 
     79        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     80      </file> 
     81      <file Name="http-strings.c" file_name="webserver/http-strings.c"> 
     82        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     83      </file> 
     84      <file Name="uip_arp.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/uip_arp.c"> 
     85        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     86      </file> 
     87      <file Name="psock.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/psock.c"> 
     88        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     89      </file> 
     90      <file Name="timer.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/timer.c"> 
     91        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     92      </file> 
     93      <file Name="uip.c" file_name="../Common/ethernet/uIP/uip-1.0/uip/uip.c"> 
     94        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/> 
     95      </file> 
     96    </folder> 
     97    <configuration Name="THUMB" c_preprocessor_definitions="THUMB_INTERWORK"/> 
     98    <configuration Name="ARM Flash Release" c_preprocessor_definitions="STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size"/> 
     99    <configuration Name="THUMB Flash Debug" arm_linker_fiq_stack_size="0" arm_linker_heap_size="0" arm_linker_stack_size="0" arm_linker_svc_stack_size="512"/> 
    93100  </project> 
    94   <configuration inherited_configurations="ARM;Flash;Debug" Name="ARM Flash Debug" /> 
    95   <configuration arm_library_instruction_set="ARM" c_preprocessor_definitions="__ARM" arm_instruction_set="ARM" hidden="Yes" Name="ARM" /> 
    96   <configuration c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes" Name="Flash" /> 
    97   <configuration c_preprocessor_definitions="DEBUG" link_include_startup_code="No" gcc_optimization_level="None" build_debug_information="Yes" hidden="Yes" Name="Debug" /> 
    98   <configuration inherited_configurations="ARM;Flash;Release" Name="ARM Flash Release" /> 
    99   <configuration c_preprocessor_definitions="NDEBUG" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" hidden="Yes" Name="Release" /> 
    100   <configuration inherited_configurations="THUMB;Flash;Debug" Name="THUMB Flash Debug" /> 
    101   <configuration arm_library_instruction_set="THUMB" c_preprocessor_definitions="__THUMB" arm_instruction_set="THUMB" hidden="Yes" Name="THUMB" /> 
    102   <configuration arm_linker_stack_size="256" Name="Common" /> 
     101  <configuration Name="ARM Flash Debug" inherited_configurations="ARM;Flash;Debug"/> 
     102  <configuration Name="ARM" arm_instruction_set="ARM" arm_library_instruction_set="ARM" c_preprocessor_definitions="__ARM" hidden="Yes"/> 
     103  <configuration Name="Flash" c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes"/> 
     104  <configuration Name="Debug" build_debug_information="Yes" c_preprocessor_definitions="DEBUG" gcc_optimization_level="None" hidden="Yes" link_include_startup_code="No"/> 
     105  <configuration Name="ARM Flash Release" inherited_configurations="ARM;Flash;Release"/> 
     106  <configuration Name="Release" build_debug_information="No" c_preprocessor_definitions="NDEBUG" gcc_optimization_level="Level 1" hidden="Yes" link_include_startup_code="No"/> 
     107  <configuration Name="THUMB Flash Debug" inherited_configurations="THUMB;Flash;Debug"/> 
     108  <configuration Name="THUMB" arm_instruction_set="THUMB" arm_library_instruction_set="THUMB" c_preprocessor_definitions="__THUMB" hidden="Yes"/> 
     109  <configuration Name="Common" arm_linker_stack_size="256"/> 
    103110</solution> 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs

    r14 r17  
    11<!DOCTYPE CrossStudio_for_ARM_Session_File> 
    22<session> 
    3  <Autos> 
    4   <Watches active="0" /> 
    5  </Autos> 
    63 <Bookmarks/> 
    7  <Breakpoints> 
    8   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="D_Abort" filename="" /> 
    9   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="FIQ" filename="" /> 
    10   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="IRQ" filename="" /> 
    11   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="P_Abort" filename="" /> 
    12   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" /> 
    13   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="SWI" filename="" /> 
    14   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="Undef" filename="" /> 
    15   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="BusFault" filename="" /> 
    16   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="ExceptionEntryReturnFault" filename="" /> 
    17   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="HardFault" filename="" /> 
    18   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="MemManage" filename="" /> 
    19   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" /> 
    20   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_CheckingError" filename="" /> 
    21   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_Coprocessor" filename="" /> 
    22   <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_StateError" filename="" /> 
    23  </Breakpoints> 
     4 <Breakpoints/> 
    245 <ExecutionCountWindow/> 
    256 <Memory1> 
     
    3516  <MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" addressSpace="" /> 
    3617 </Memory4> 
    37  <MemoryUsageWindow> 
    38   <ProjectSessionItem path="RTOSDemo" name="unnamed" /> 
    39   <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" /> 
    40   <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" /> 
    41   <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" /> 
    42  </MemoryUsageWindow> 
    4318 <Project> 
    4419  <ProjectSessionItem path="RTOSDemo" name="unnamed" /> 
    4520  <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" /> 
    4621  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" /> 
    47   <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" /> 
    4822 </Project> 
    4923 <Register1> 
     
    5933  <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" /> 
    6034 </Register4> 
    61  <SourceNavigatorWindow/> 
     35 <TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" /> 
    6236 <TraceWindow> 
    63   <Trace wrap="Yes" type="1" enabled="Yes" /> 
     37  <Trace enabled="Yes" /> 
    6438 </TraceWindow> 
    6539 <Watch1> 
    66   <Watches active="0" /> 
     40  <Watches active="0" update="Never" /> 
    6741 </Watch1> 
    6842 <Watch2> 
    69   <Watches active="0" /> 
     43  <Watches active="0" update="Never" /> 
    7044 </Watch2> 
    7145 <Watch3> 
    72   <Watches active="0" /> 
     46  <Watches active="0" update="Never" /> 
    7347 </Watch3> 
    7448 <Watch4> 
    75   <Watches active="1" > 
     49  <Watches active="1" update="Never" > 
     50   <Watchpoint linenumber="125" radix="-1" name="led_1_state" expression="led_1_state" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" /> 
     51   <Watchpoint linenumber="131" radix="-1" name="xLastFlashTime" expression="xLastFlashTime" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" /> 
     52   <Watchpoint linenumber="131" radix="-1" name="xFlashRate" expression="xFlashRate" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" /> 
     53   <Watchpoint linenumber="139" radix="-1" name="uxLED" expression="uxLED" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" /> 
    7654   <Watchpoint linenumber="0" radix="-1" name="xStart" expression="xStart" filename="" /> 
     55   <Watchpoint linenumber="139" radix="16" name="partstNUM_LEDS" expression="partstNUM_LEDS" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" /> 
    7756  </Watches> 
    7857 </Watch4> 
    7958 <Files> 
    80   <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" y="72" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" left="0" selected="0" name="unnamed" top="47" /> 
    81   <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" y="117" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="80" /> 
    82   <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="27" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" y="261" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" left="0" selected="0" name="unnamed" top="225" /> 
    83   <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="33" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" y="7" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" left="0" selected="1" name="unnamed" top="0" /> 
     59  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\birdy\Desktop\FreeRTOS\Demo\Common\Minimal\semtest.c" y="200" path="C:\Dokumente und Einstellungen\birdy\Desktop\FreeRTOS\Demo\Common\Minimal\semtest.c" left="0" selected="0" name="unnamed" top="189" /> 
     60  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\birdy\Desktop\repo\webserver\example\freeRTOS\Demo\ARM7_LPC2368_Rowley\main.c" y="48" path="C:\Dokumente und Einstellungen\birdy\Desktop\repo\webserver\example\freeRTOS\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="1" name="unnamed" top="37" /> 
    8461 </Files> 
    85  <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM-RTCK" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.cpp;*.cxx;*.cc;*.c;*.h;*.hpp;*.hxx" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="ARM Flash Debug" /> 
     62 <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" /> 
    8663</session> 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/main.c

    r14 r17  
    4747 
    4848/* Environment includes. */ 
    49 #include <targets/LPC2368.h> 
     49#include <targets/LPC23xx.h> 
    5050 
    5151/* Scheduler includes. */ 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c

    r14 r17  
    1717 
    1818    /* Clear the interrupt. */ 
    19     IntClear = 0xffff; 
     19    MAC_INTCLEAR = 0xffff; 
    2020    VICVectAddr = 0; 
    2121 
  • webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c

    r14 r17  
    7777#define uipIP_ADDR0             192 
    7878#define uipIP_ADDR1             168 
    79 #define uipIP_ADDR2             0 
    80 #define uipIP_ADDR3            200     
     79#define uipIP_ADDR2             3 
     80#define uipIP_ADDR3             100    
    8181 
    8282/* How long to wait before attempting to connect the MAC again. */ 
     
    152152        portENTER_CRITICAL(); 
    153153        { 
    154         IntEnable = INT_RX_DONE; 
     154        MAC_INTENABLE = INT_RX_DONE; 
    155155        VICIntEnable |= 0x00200000; 
    156156        VICVectAddr21 = ( portLONG ) vEMAC_ISR_Wrapper; 
  • webserver/example/freeRTOS/Demo/Common/Minimal/flash.c

    r14 r17  
    7171 
    7272#define ledSTACK_SIZE           configMINIMAL_STACK_SIZE 
    73 #define ledNUMBER_OF_LEDS       ( 3
     73#define ledNUMBER_OF_LEDS       ( 1
    7474#define ledFLASH_RATE_BASE      ( ( portTickType ) 333 ) 
    7575 
  • webserver/example/freeRTOS/Source/include/portable.h

    r14 r17  
    9797#endif 
    9898 
    99 #ifdef GCC_ARM7 
    100         #include "../../Source/portable/GCC/ARM7_LPC2000/portmacro.h" 
    101 #endif 
    102  
    103 #ifdef GCC_ARM7_ECLIPSE 
    104       #include "portmacro.h" 
    105 #endif 
    106  
    107 #ifdef ROWLEY_LPC23xx 
     99//#ifdef GCC_ARM7 
     100        //#include "../../Source/portable/GCC/ARM7_LPC2000/portmacro.h" 
     101//#endif 
     102 
     103//#ifdef GCC_ARM7_ECLIPSE 
     104//    #include "portmacro.h" 
     105//#endif 
     106 
     107//#ifdef ROWLEY_LPC23xx 
    108108        #include "../../Source/portable/GCC/ARM7_LPC23xx/portmacro.h" 
    109 #endif 
     109 //       #warning "ROWLEY_LPC23xx" 
     110 
     111//#endif 
    110112 
    111113#ifdef IAR_MSP430