From: Uwe Hermann <redacted>
Date: Sun, 13 May 2018 16:28:05 +0000 (+0200)
Subject: st7735: Merge reset_state() into reset().
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ef10cea73bd05b44a213b76c6c4abb9b543cd46d;p=libsigrokdecode.git

st7735: Merge reset_state() into reset().
---

diff --git a/decoders/st7735/pd.py b/decoders/st7735/pd.py
index f704c03..999038a 100644
--- a/decoders/st7735/pd.py
+++ b/decoders/st7735/pd.py
@@ -95,18 +95,15 @@ class Decoder(srd.Decoder):
         self.reset()
 
     def reset(self):
-        pass
-
-    def start(self):
-        self.out_ann = self.register(srd.OUTPUT_ANN)
-
-    def reset_state(self):
         self.accum_byte = 0
         self.accum_bits_num = 0
         self.bit_ss = -1
         self.byte_ss = -1
         self.current_bit = -1
 
+    def start(self):
+        self.out_ann = self.register(srd.OUTPUT_ANN)
+
     def put_desc(self, ss, es, cmd, data):
         if cmd == -1:
             return
@@ -130,13 +127,13 @@ class Decoder(srd.Decoder):
         current_data = []
         desc_ss = -1
         desc_es = -1
-        self.reset_state()
+        self.reset()
         while True:
             # Check data on both CLK edges.
             (cs, clk, mosi, dc) = self.wait({1: 'e'})
 
             if cs == 1: # Wait for CS = low, ignore the rest.
-                self.reset_state()
+                self.reset()
                 continue
 
             if clk == 1: