Changeset 2b3dd78 in mainline for uspace/lib/pcm/include/pcm/sample_format.h

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/pcm/include/pcm/sample_format.h (modified) (1 diff)

uspace/lib/pcm/include/pcm/sample_format.h

@@ -184 +184 @@
         switch(format) {
         case PCM_SAMPLE_UINT8:
-                return "8 bit unsinged";
+                return "8 bit unsigned";
         case PCM_SAMPLE_SINT8:
-                return "8 bit singed";
+                return "8 bit signed";
         case PCM_SAMPLE_UINT16_LE:
                 return "16 bit unsigned(LE)";
         case PCM_SAMPLE_SINT16_LE:
-                return "16 bit singed(LE)";
+                return "16 bit signed(LE)";
         case PCM_SAMPLE_UINT16_BE:
                 return "16 bit unsigned(BE)";