Changeset 5f5f681 in rtems for tools/cpu/nios2


Ignore:
Timestamp:
Dec 10, 2009, 7:20:06 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
e8cf7b5
Parents:
c9ece2e
Message:

Whitespace removal.

Location:
tools/cpu/nios2
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • tools/cpu/nios2/bridges.c

    rc9ece2e r5f5f681  
    1313
    1414/* This part of the program builds a list with pairs of bus
    15    master port names (each is "device name/master port name"). 
     15   master port names (each is "device name/master port name").
    1616   It is then possible to find if a given master is actually
    1717   available under a different master port name through bridges.
     
    2222   tristate_bridge_0 itself is slave of cpu0/data_master, the
    2323   bridge information would be stored as this bus_bridge_pair:
    24       mastered_by = "cpu0/data_master" and 
     24      mastered_by = "cpu0/data_master" and
    2525      bridges_to = "tristate_bridge_0/tristate_master".
    2626   That allows to deduce that SRAM is actually mastered by
     
    3737
    3838int is_bridged(
    39   char *cpu_master, 
    40   char *dev_master, 
     39  char *cpu_master,
     40  char *dev_master,
    4141  bus_bridge_pair *bridges)
    4242{
     
    4848  for(bbp = bridges; bbp != NULL; bbp=bbp->next)
    4949  {
    50     if(strcmp(cpu_master, bbp->mastered_by) == 0 && 
     50    if(strcmp(cpu_master, bbp->mastered_by) == 0 &&
    5151       is_bridged(bbp->bridges_to, dev_master, bridges))
    5252    {
  • tools/cpu/nios2/bridges.h

    rc9ece2e r5f5f681  
    2323
    2424int is_bridged(
    25   char *cpu_master, 
    26   char *dev_master, 
     25  char *cpu_master,
     26  char *dev_master,
    2727  bus_bridge_pair *bridges);
    2828
  • tools/cpu/nios2/clocks.c

    rc9ece2e r5f5f681  
    5252    struct ptf named     = { item, 0, 0, 0, 0 };
    5353    struct ptf_item clk_cfg = { 2, &all, &named };
    54  
     54
    5555    clocks = NULL;
    5656    ptf_match(sopc, &clk_spec, add_clock_spec, &clocks);
  • tools/cpu/nios2/devices.c

    rc9ece2e r5f5f681  
    6666
    6767device_desc *find_devices(
    68   struct ptf *ptf, 
    69   struct ptf *cfg, 
    70   struct ptf *cpu, 
     68  struct ptf *ptf,
     69  struct ptf *cfg,
     70  struct ptf *cpu,
    7171  bus_bridge_pair *bridges)
    7272{
  • tools/cpu/nios2/devices.h

    rc9ece2e r5f5f681  
    1515#include "bridges.h"
    1616
    17 typedef struct dev_descr 
     17typedef struct dev_descr
    1818{
    1919  int slaves;
     
    2525
    2626device_desc *find_devices(
    27   struct ptf *ptf, 
    28   struct ptf *cfg, 
    29   struct ptf *cpu, 
     27  struct ptf *ptf,
     28  struct ptf *cfg,
     29  struct ptf *cpu,
    3030  bus_bridge_pair *bridges);
    3131
  • tools/cpu/nios2/linkcmds.c

    rc9ece2e r5f5f681  
    113113    fprintf(file, "    %s : ORIGIN = 0x%08X, LENGTH = 0x%08X\n", tmd->dev->cfgname, tmd->base, tmd->size);
    114114  }
    115  
     115
    116116
    117117  fprintf(file, "}\n\n");
     
    120120}
    121121
    122  
     122
  • tools/cpu/nios2/memory.c

    rc9ece2e r5f5f681  
    7373            tmd->dev = dd;
    7474
    75             if(memory == NULL) 
     75            if(memory == NULL)
    7676            {
    7777              tmd->next = NULL;
     
    8080            else
    8181            {
    82               if(tmd->size > memory->size) 
     82              if(tmd->size > memory->size)
    8383              {
    8484                tmd->next = memory;
     
    102102}
    103103
    104  
     104
  • tools/cpu/nios2/nios2gen.c

    rc9ece2e r5f5f681  
    183183        break;
    184184
    185       case 'L': /* Do not output linker script */ 
     185      case 'L': /* Do not output linker script */
    186186        output_linkcmds = 0;
    187187        break;
     
    242242        return -1;
    243243      };
    244  
     244
    245245      if(verbose) printf("Successfully read config PTF file %s.\n", argv[optind]);
    246246
     
    291291        fprintf(stderr, "The available CPUs are named as follows:\n");
    292292        ptf_match(sopc, &class_spec, printf_ptf_value, "  %s\n");
    293         return -1; 
     293        return -1;
    294294      };
    295295
     
    297297      {
    298298        fprintf(stderr, "There is no NIOS2 cpu in the system.\n");
    299         return -1; 
     299        return -1;
    300300      }
    301301    };
    302302
    303303    if(verbose)
    304     { 
     304    {
    305305      printf("Using NIOS II CPU '%s'.\n", cpu->value);
    306306      printf("Only modules mastered by this CPU are considered now.\n");
     
    383383
    384384    memory = find_memory(devices);
    385    
     385
    386386    if(verbose)
    387387    {
  • tools/cpu/nios2/output.c

    rc9ece2e r5f5f681  
    9292  else
    9393  {
    94     fprintf(dinfo->file, "#define %s_%s %s\n", 
     94    fprintf(dinfo->file, "#define %s_%s %s\n",
    9595      dinfo->dev->cfgname, dinfo->orig_value,
    9696      pi->item[pi->level]->value);
     
    110110  f = ptf_find(pi->item[pi->level]->sub, &fi, item, 0, 0);
    111111
    112   while(f != NULL) 
     112  while(f != NULL)
    113113  {
    114114    dinfo->orig_value = f->value;
     
    193193}
    194194
    195  
     195
  • tools/cpu/nios2/ptf.c

    rc9ece2e r5f5f681  
    5353    more_section_name_chars,
    5454    more_item_value_chars,
    55   } expectation; 
     55  } expectation;
    5656};
    5757
     
    241241
    242242      if(is_not_quoted && c == '}')
    243       { 
     243      {
    244244        parser_event = section_closed;
    245245      }
     
    470470  f = fopen(filename, "r");
    471471  if(f == NULL)
    472   { 
     472  {
    473473    perror(filename);
    474474    return NULL;
     
    687687          if(strcmp(leaf->value, value) == 0) return 0; /* got it */
    688688        }
    689       } 
     689      }
    690690      else if(leaf->name != NULL)
    691691      {
     
    713713
    714714struct ptf *ptf_find(
    715   struct ptf *tree, 
     715  struct ptf *tree,
    716716  struct ptf_item *item,
    717717  ptf_item_type ttype,
     
    765765int ptf_match(
    766766  struct ptf *const ptf,
    767   struct ptf_item *const match, 
    768   const ptf_match_action action, 
     767  struct ptf_item *const match,
     768  const ptf_match_action action,
    769769  void *arg)
    770770{
     
    789789
    790790        if(mtype == p->type &&
    791            (mname==NULL || p->name==NULL || strcmp(mname, p->name)==0) && 
     791           (mname==NULL || p->name==NULL || strcmp(mname, p->name)==0) &&
    792792           (mvalue==NULL || p->value==NULL || strcmp(mvalue, p->value)==0))
    793793        {
  • tools/cpu/nios2/ptf.h

    rc9ece2e r5f5f681  
    4747
    4848struct ptf *ptf_find(
    49   struct ptf *tree, 
    50   struct ptf_item *item, 
     49  struct ptf *tree,
     50  struct ptf_item *item,
    5151  ptf_item_type ttype,
    52   char *name, 
     52  char *name,
    5353  char *value);
    5454
    5555struct ptf *ptf_next(
    56   struct ptf_item *item, 
     56  struct ptf_item *item,
    5757  ptf_item_type ttype,
    58   char *name, 
     58  char *name,
    5959  char *value);
    6060
    6161int ptf_match(
    6262  struct ptf *const ptf,
    63   struct ptf_item *const match, 
    64   const ptf_match_action action, 
     63  struct ptf_item *const match,
     64  const ptf_match_action action,
    6565  void *arg);
    6666
Note: See TracChangeset for help on using the changeset viewer.