summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--decoders/edid/pd.py2
-rw-r--r--decoders/mx25lxx05d/pd.py2
-rw-r--r--decoders/mxc6225xu/pd.py2
-rw-r--r--decoders/spdif/pd.py2
-rw-r--r--decoders/xfp/pd.py2
-rw-r--r--tests/session.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index bd21b02..ec40143 100644
--- a/NEWS
+++ b/NEWS
@@ -64,10 +64,10 @@ means it is NOT backwards-compatible and frontends will need updates.
- Either MISO or MOSI can be optional now, but not both (bug #175).
- The CS# pin is optional now. If the pin is supplied, it is honored
(decoding only happens when the pin is asserted). Otherwise decoding will
- use every CLK edge, regardless of CS# state or CS# existance (bug #152).
+ use every CLK edge, regardless of CS# state or CS# existence (bug #152).
- Rename the 'SCK' pin to the more common 'CLK'.
- Output bit-exact annotations and data for use by stacked PDs.
- - Fix a bug occuring when only MOSI (but not MISO) was supplied.
+ - Fix a bug occurring when only MOSI (but not MISO) was supplied.
* transitioncounter:
- Drop the obsolete 'transitioncounter' dummy protocol decoder.
* uart:
diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index 3c1ede2..b154de7 100644
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -333,7 +333,7 @@ class Decoder(srd.Decoder):
modestr += est_modes[i] + ', '
if modestr:
self.ann_field(offset, offset+2,
- 'Supported establised modes: %s' % modestr[:-2])
+ 'Supported established modes: %s' % modestr[:-2])
def decode_std_timing(self, offset):
modestr = ''
diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index 0217de4..b5ccee0 100644
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -252,7 +252,7 @@ class Decoder(srd.Decoder):
self.ss_block = self.ss
self.putx([8, ['Command: %s' % cmds[self.state][1]]])
elif self.cmdstate in (2, 3, 4):
- # Bytes 2/3/4: Master sends sectror address (24bits, MSB-first).
+ # Bytes 2/3/4: Master sends sector address (24bits, MSB-first).
self.addr |= (mosi << ((4 - self.cmdstate) * 8))
# self.putx([0, ['Sector address, byte %d: 0x%02x' % \
# (4 - self.cmdstate, mosi)]])
diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index 8b3dcc9..962f963 100644
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -97,7 +97,7 @@ class Decoder(srd.Decoder):
# Bits[7:7]: INT
int_val = (b >> 7) & 1
s = 'unchanged and no' if (int_val == 0) else 'changed or'
- ann = 'INT = %d: Orientation %s shake event occured\n' % (int_val, s)
+ ann = 'INT = %d: Orientation %s shake event occurred\n' % (int_val, s)
# Bits[6:5]: SH[1:0]
sh = (((b >> 6) & 1) << 1) | ((b >> 5) & 1)
diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py
index bd75cff..e6977e2 100644
--- a/decoders/spdif/pd.py
+++ b/decoders/spdif/pd.py
@@ -210,7 +210,7 @@ class Decoder(srd.Decoder):
elif self.preamble == [2, 1, 1, 2]:
self.puty([1, ['Preamble B', 'B']])
else:
- self.puty([1, ['Unknown Preamble', 'Unkown Prea.', 'U']])
+ self.puty([1, ['Unknown Preamble', 'Unknown Prea.', 'U']])
self.preamble = []
self.seen_preamble = True
self.bitcount = 0
diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index 9a6543c..41aca0d 100644
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -318,7 +318,7 @@ class Decoder(srd.Decoder):
self.annotate("Vendor ID", chr(data[i]), cnt, cnt)
# Convert 16-bit two's complement values, with each increment
- # representing 1/256C, to degrees Celcius.
+ # representing 1/256C, to degrees Celsius.
def to_temp(self, value):
if value & 0x8000:
value = -((value ^ 0xffff) + 1)
diff --git a/tests/session.c b/tests/session.c
index d6895af..2ca16b3 100644
--- a/tests/session.c
+++ b/tests/session.c
@@ -204,7 +204,7 @@ START_TEST(test_session_metadata_set_bogus)
srd_init(NULL);
srd_session_new(&sess);
- /* Incorrect gvariant type (currently only uint64 is used). */
+ /* Incorrect GVariant type (currently only uint64 is used). */
conf_check_fail_str(sess, SRD_CONF_SAMPLERATE, "");
conf_check_fail_str(sess, SRD_CONF_SAMPLERATE, "Foo");