Changeset 598 for GPL/trunk/alsa-kernel/include/sound/opl3.h

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/opl3.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/opl3.h

@@ -18 +18 @@
  *
  *      With the above exceptions the both sides can be operated independently.
- *
+ *      
  *      A 4 OP voice can be created by setting the corresponding
  *      bit at offset 4 of the right side.
@@ -27 +27 @@
  *
  *      If a voice is set to the 2 OP mode, it works like 2 OP modes
- *      of the original YM3812 (AdLib). In addition the voice can
+ *      of the original YM3812 (AdLib). In addition the voice can 
  *      be connected the left, right or both stereo channels. It can
  *      even be left unconnected. This works with 4 OP voices also.
@@ -189 +189 @@
  *
  *
- *
+ *                                      
  *                                       +---+
  *                                       |   |
@@ -195 +195 @@
  *                                                |->
  *                                      >--3----4-+
- *
+ *                                      
  *                                       +---+
  *                                       |   |
@@ -251 +251 @@
         unsigned char sustain_release;
         unsigned char wave_select;
+#ifndef TARGET_OS2
 } __attribute__((packed));
-#ifdef TARGET_OS2
+#else
+};
 #pragma pack()
 #endif
@@ -341 +343 @@
         struct snd_midi_channel_set * oss_chset;
 #endif
-
+ 
 #define OPL3_PATCH_HASH_SIZE    32
         struct fm_patch *patch_table[OPL3_PATCH_HASH_SIZE];