Changeset 7508

Show
Ignore:
Timestamp:
01/25/08 07:23:38
Author:
jcorgan
Message:

Applied changeset r7442 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/gr-usrp/src/usrp.py

    r6136 r7508  
    11# 
    2 # Copyright 2004,2005 Free Software Foundation, Inc. 
     2# Copyright 2004,2005,2007 Free Software Foundation, Inc. 
    33#  
    44# This file is part of GNU Radio 
    …… 
    2727from gnuradio import gru 
    2828from usrpm.usrp_fpga_regs import * 
     29import weakref 
    2930 
    3031FPGA_MODE_NORMAL   = usrp1.FPGA_MODE_NORMAL 
    …… 
    380381    @param subdev_spec: return value from subdev option parser.   
    381382    @type  subdev_spec: (side, subdev), where side is 0 or 1 and subdev is 0 or 1 
    382     @returns: an instance derived from db_base 
     383    @returns: an weakref to an instance derived from db_base 
    383384    """ 
    384385    side, subdev = subdev_spec 
    385     return u.db[side][subdev] 
     386    # Note: This allows db to go out of scope at the right time 
     387    return weakref.proxy(u.db[side][subdev]) 
    386388 
    387389