Changeset 2335

Show
Ignore:
Timestamp:
09/17/03 16:27:26
Author:
eblossom
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • import/usrp-svnrepository-20060801/trunk/ChangeLog

    r2332 r2335  
     12003-09-17  Eric Blossom  <eb@comsec.com> 
     2 
     3        * host/lib/Usrp.cc (find_file): changed load path for firmware and 
     4        fpga bits to to /usr/local/share/usrp. 
     5        (Usrp): now set gstate, sleep, fpga_reset and tx_enable per Matt's 
     6        script. 
     7 
    182003-09-16  Eric Blossom  <eb@comsec.com> 
    29 

  • import/usrp-svnrepository-20060801/trunk/config/Makefile.am

    r2332 r2335  
    3939 
    4040# The following is boilerplate 
    41 m4data_DATA = $(m4macros)  
    42 EXTRA_DIST = $(m4data_DATA)  
     41#m4data_DATA = $(m4macros)  
     42EXTRA_DIST = $(m4macros)  
    4343 

  • import/usrp-svnrepository-20060801/trunk/configure.ac

    r2332 r2335  
    2525AC_CONFIG_SRCDIR([host/lib/Usrp.cc]) 
    2626AM_CONFIG_HEADER(config.h) 
    27 AC_PREFIX_DEFAULT(/usr/local/gnuradio) 
     27AC_PREFIX_DEFAULT(/usr/local) 
    2828AC_CANONICAL_TARGET([]) 
    2929AM_INIT_AUTOMAKE(usrp,0.1cvs) 

  • import/usrp-svnrepository-20060801/trunk/firmware/basic_fw/include/usrp_config.h

    r2331 r2335  
    2727 * Define to 1 to write trace to port A for scoping with logic analyzer. 
    2828 */ 
    29 #define UC_TRACE_USING_PORT_A                   1 
     29#define UC_TRACE_USING_PORT_A                   0 
    3030 
    3131 
    …… 
    3535 * low three bits of port E. 
    3636 */ 
    37 #define UC_START_WITH_GSTATE_OUTPUT_ENABLED     1 
     37#define UC_START_WITH_GSTATE_OUTPUT_ENABLED     0 
    3838 
    3939 
    …… 
    4242 * Define to 1 for debug use on board without FPGA. 
    4343 */ 
    44 #define UC_BOARD_HAS_FPGA                       0 
     44#define UC_BOARD_HAS_FPGA                       1 

  • import/usrp-svnrepository-20060801/trunk/host/lib/Usrp.cc

    r2333 r2335  
    127127 * Search USRPPATH looking for NAME (someday). 
    128128 * 
    129  * For now, check the current directory and /usr/local/gnuradio/share 
     129 * For now, check the current directory and /usr/local/share 
    130130 * 
    131131 * Return complete filename if found, else 0. 
    …… 
    147147 
    148148  // FIXME buffer overrun possibility... 
    149   strcpy (buf, "/usr/local/gnuradio/share/"); 
     149  strcpy (buf, "/usr/local/share/usrp/"); 
    150150  strcat (buf, name); 
    151151 
    …… 
    229229  } 
    230230 
     231  _set_led (1, 1);      // led 1 on 
     232 
     233  _set_gstate_output_enable (0);        // don't drive GPIF state on Port E 
     234  _set_sleep_bits (0);                  // enable DACs and ADCs 
     235  _set_fpga_reset (1); 
     236  _set_fpga_tx_enable (0); 
     237  _set_fpga_rx_enable (0); 
     238 
    231239  fprintf (stderr, "Usrp: loading fpga bits: %s...\n", filename); 
    232240  if (!_load_fpga (filename)) 
    233241    throw std::runtime_error ("can't load fpga"); 
     242 
     243  _set_fpga_reset (0); 
     244 
     245  update_combo_reg ();                  // load 
     246  _write_fpga_reg (4, 171798692);       // from matt's example 
     247 
     248  _set_fpga_tx_enable (1);              // enable tx 
     249  _set_led (1, 0);                      // led 1 off 
    234250} 
    235251 
    …… 
    287303Usrp::write (const void *buf, int len) 
    288304{ 
    289   if (len < 0 || (len % 512) != 0) 
    290     return false; 
     305  // printf ("Usrp::write: len = %d\n", len); 
     306   
     307  if (len < 0 || (len % 512) != 0){ 
     308    fprintf (stderr, "Usrp::write: invalid length = %d\n", len); 
     309    return false; 
     310  } 
    291311 
    292312  int r = usb_bulk_write (d_udh, USRP_DATAOUT_ENDPOINT, (char *) buf, len, 1000); 

  • import/usrp-svnrepository-20060801/trunk/host/usrper/Makefile

    r2332 r2335  
    169169pkgpyexecdir = ${pyexecdir}/usrp 
    170170pkgpythondir = ${pythondir}/usrp 
    171 prefix = /usr/local/gnuradio 
     171prefix = /usr/local 
    172172program_transform_name = s,x,x, 
    173173pyexecdir = ${exec_prefix}/lib/python2.2/site-packages