Changeset 598 for GPL/trunk/alsa-kernel/include/sound/asequencer.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/asequencer.h (modified) (5 diffs)

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

@@ -68 +68 @@
 #define SNDRV_SEQ_EVENT_TIMESIGN        23      /* SMF Time Signature event */
 #define SNDRV_SEQ_EVENT_KEYSIGN         24      /* SMF Key Signature event */
-        
+                
 /** timer messages
  * event data type = snd_seq_ev_queue_control
@@ -222 +222 @@
 
         /* external stored data */
-#ifndef TARGET_OS2      
+#ifndef TARGET_OS2
 struct snd_seq_ev_ext {
         unsigned int len;       /* length of data */
@@ -235 +235 @@
 #pragma pack()
 #endif
-
 struct snd_seq_result {
         int event;              /* processed event type */
@@ -274 +273 @@
 
         /* quoted event - inside the kernel only */
-#ifndef TARGET_OS2      
+#ifndef TARGET_OS2
 struct snd_seq_ev_quote {
         struct snd_seq_addr origin;             /* original sender */
@@ -423 +422 @@
 #define USER_CLIENT     ((__force snd_seq_client_type_t) 1)
 #define KERNEL_CLIENT   ((__force snd_seq_client_type_t) 2)
-
+                        
         /* event filter flags */
 #define SNDRV_SEQ_FILTER_BROADCAST      (1<<0)  /* accept broadcast messages */