## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
##
import sigrokdecode as srd
VENDOR_CODE_ATMEL = 0x1e
class Decoder(srd.Decoder):
- api_version = 1
+ api_version = 3
id = 'avr_isp'
name = 'AVR ISP'
longname = 'AVR In-System Programming'
- desc = 'Protocol for in-system programming Atmel AVR MCUs.'
+ desc = 'Atmel AVR In-System Programming (ISP) protocol.'
license = 'gplv2+'
- inputs = ['spi', 'logic']
- outputs = ['avr_isp']
- probes = []
- optional_probes = [
- {'id': 'reset', 'name': 'RESET#', 'desc': 'Target AVR MCU reset'},
- ]
- options = {}
- annotations = [
- ['pe', 'Programming enable'],
- ['rsb0', 'Read signature byte 0'],
- ['rsb1', 'Read signature byte 1'],
- ['rsb2', 'Read signature byte 2'],
- ['ce', 'Chip erase'],
- ['rfb', 'Read fuse bits'],
- ['rhfb', 'Read high fuse bits'],
- ['refb', 'Read extended fuse bits'],
- ['warnings', 'Warnings'],
- ]
+ inputs = ['spi']
+ outputs = []
+ tags = ['Debug/trace']
+ annotations = (
+ ('pe', 'Programming enable'),
+ ('rsb0', 'Read signature byte 0'),
+ ('rsb1', 'Read signature byte 1'),
+ ('rsb2', 'Read signature byte 2'),
+ ('ce', 'Chip erase'),
+ ('rfb', 'Read fuse bits'),
+ ('rhfb', 'Read high fuse bits'),
+ ('refb', 'Read extended fuse bits'),
+ ('warning', 'Warning'),
+ ('dev', 'Device'),
+ )
annotation_rows = (
('bits', 'Bits', ()),
('commands', 'Commands', tuple(range(7 + 1))),
('warnings', 'Warnings', (8,)),
+ ('devs', 'Devices', (9,)),
)
- def __init__(self, **kwargs):
+ def __init__(self):
+ self.reset()
+
+ def reset(self):
self.state = 'IDLE'
self.mosi_bytes, self.miso_bytes = [], []
- self.cmd_ss, self.cmd_es = 0, 0
+ self.ss_cmd, self.es_cmd = 0, 0
self.xx, self.yy, self.zz, self.mm = 0, 0, 0, 0
+ self.ss_device = None
def start(self):
- # self.out_python = self.register(srd.OUTPUT_PYTHON)
self.out_ann = self.register(srd.OUTPUT_ANN)
def putx(self, data):
- self.put(self.cmd_ss, self.cmd_es, self.out_ann, data)
+ self.put(self.ss_cmd, self.es_cmd, self.out_ann, data)
def handle_cmd_programming_enable(self, cmd, ret):
# Programming enable.
# Store for later.
self.mm = cmd[3]
+ self.ss_device = self.ss_cmd
# Sanity check on reply.
if ret[1] != 0x30 or ret[2] != cmd[1] or ret[0] != self.yy:
self.part_number = ret[3]
self.putx([3, ['Part number: 0x%02x' % ret[3]]])
- # TODO: Fix range.
p = part[(self.part_fam_flash_size, self.part_number)]
- self.putx([3, ['Device: Atmel %s' % p]])
+ data = [9, ['Device: Atmel %s' % p]]
+ self.put(self.ss_device, self.es_cmd, self.out_ann, data)
# Sanity check on reply.
if ret[1] != 0x30 or ret[2] != self.xx or ret[0] != self.mm:
self.ss, self.es = ss, es
if len(self.mosi_bytes) == 0:
- self.cmd_ss = ss
+ self.ss_cmd = ss
# Append new bytes.
self.mosi_bytes.append(mosi)
if len(self.mosi_bytes) < 4:
return
- self.cmd_es = es
+ self.es_cmd = es
self.handle_command(self.mosi_bytes, self.miso_bytes)
self.mosi_bytes = []
self.miso_bytes = []
-