Removed IPC code from sequencer code

diff --git a/include/seq.h b/include/seq.h
index 7ab7d7f..3079276 100644 (file)
--- a/include/seq.h
+++ b/include/seq.h
@@ -586,8 +586,7 @@ enum {
        SND_SEQ_EVFLG_RAW,
        SND_SEQ_EVFLG_FIXED,
        SND_SEQ_EVFLG_VARIABLE,
-       SND_SEQ_EVFLG_VARUSR,
-       SND_SEQ_EVFLG_IPC
+       SND_SEQ_EVFLG_VARUSR
 };
 
 enum {
@@ -655,9 +654,6 @@ extern const unsigned int snd_seq_event_types[];
 /** event type check: user pointer events */
 #define snd_seq_ev_is_varusr_type(ev) \
        snd_seq_type_check(ev, SND_SEQ_EVFLG_VARUSR)
-/** event type check: ipc events */
-#define snd_seq_ev_is_varipc_type(ev) \
-       snd_seq_type_check(ev, SND_SEQ_EVFLG_IPC)
 /** event type check: reserved for kernel */
 #define snd_seq_ev_is_reserved(ev) \
        (! snd_seq_event_types[(ev)->type])
@@ -681,9 +677,6 @@ extern const unsigned int snd_seq_event_types[];
 /** variable length on user-space */
 #define snd_seq_ev_is_varusr(ev) \
        (snd_seq_ev_length_type(ev) == SND_SEQ_EVENT_LENGTH_VARUSR)
-/** variable length on IPC shm */
-#define snd_seq_ev_is_varipc(ev) \
-       (snd_seq_ev_length_type(ev) == SND_SEQ_EVENT_LENGTH_VARIPC)
 
 /** time-stamp type */
 #define snd_seq_ev_timestamp_type(ev) \

diff --git a/include/seq_event.h b/include/seq_event.h
index 0138a7f..501ced7 100644 (file)
--- a/include/seq_event.h
+++ b/include/seq_event.h
@@ -277,7 +277,6 @@ typedef union snd_seq_timestamp {
 #define SND_SEQ_EVENT_LENGTH_FIXED     (0<<2)  /**< fixed event size */
 #define SND_SEQ_EVENT_LENGTH_VARIABLE  (1<<2)  /**< variable event size */
 #define SND_SEQ_EVENT_LENGTH_VARUSR    (2<<2)  /**< variable event size - user memory space */
-#define SND_SEQ_EVENT_LENGTH_VARIPC    (3<<2)  /**< variable event size - IPC */
 #define SND_SEQ_EVENT_LENGTH_MASK      (3<<2)  /**< mask for event length bits */
 
 #define SND_SEQ_PRIORITY_NORMAL                (0<<4)  /**< normal priority */
@@ -318,14 +317,6 @@ typedef struct snd_seq_ev_ext {
        void *ptr;                      /**< pointer to data (note: can be 64-bit) */
 } snd_seq_ev_ext_t;
 
-#if 0 /* FIXME: not implemented */
-/** external stored data - IPC shared memory */
-typedef struct snd_seq_ev_ipcshm {
-       unsigned int len;               /**< length of data */
-       key_t ipc;                      /**< IPC key */
-} snd_seq_ev_ipcshm_t;
-#endif
-
 /** Instrument cluster type */
 typedef unsigned int snd_seq_instr_cluster_t;
 
@@ -444,7 +435,6 @@ typedef struct snd_seq_event {
                snd_seq_ev_raw8_t raw8;         /**< raw8 data */
                snd_seq_ev_raw32_t raw32;       /**< raw32 data */
                snd_seq_ev_ext_t ext;           /**< external data */
-               /* snd_seq_ev_ipcshm_t ipcshm; */       /* IPC shared memory */
                snd_seq_ev_queue_control_t queue; /**< queue control */
                snd_seq_timestamp_t time;       /**< timestamp */
                snd_seq_addr_t addr;            /**< address */

diff --git a/src/seq/seq_event.c b/src/seq/seq_event.c
index d0fbdad..fd80148 100644 (file)
--- a/src/seq/seq_event.c
+++ b/src/seq/seq_event.c
@@ -47,12 +47,6 @@ const unsigned int snd_seq_event_types[256] = {
        = _SND_SEQ_TYPE(SND_SEQ_EVFLG_VARIABLE),
        [SND_SEQ_EVENT_USR_VAR0 ... SND_SEQ_EVENT_USR_VAR4]
        = _SND_SEQ_TYPE(SND_SEQ_EVFLG_VARIABLE) | _SND_SEQ_TYPE(SND_SEQ_EVFLG_USERS),
-#if 0 // NYI
-       [SND_SEQ_EVENT_IPCSHM]
-       = _SND_SEQ_TYPE(SND_SEQ_EVFLG_IPC),
-       [SND_SEQ_EVENT_USR_VARIPC0 ... SND_SEQ_EVENT_USR_VARIPC4]
-       = _SND_SEQ_TYPE(SND_SEQ_EVFLG_IPC) | _SND_SEQ_TYPE(SND_SEQ_EVFLG_USERS),
-#endif
        [SND_SEQ_EVENT_NONE]
        = FIXED_EV(SND_SEQ_EVFLG_NONE),
 };

diff --git a/src/seq/seq_midi_event.c b/src/seq/seq_midi_event.c
index b9df50d..a4d2c1f 100644 (file)
--- a/src/seq/seq_midi_event.c
+++ b/src/seq/seq_midi_event.c
@@ -429,7 +429,6 @@ long snd_midi_event_decode(snd_midi_event_t *dev, unsigned char *buf, long count
                        return -ENOMEM;
                switch (ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) {
                case SNDRV_SEQ_EVENT_LENGTH_FIXED:
-               case SNDRV_SEQ_EVENT_LENGTH_VARIPC:
                        return -EINVAL; /* invalid event */
                }
                memcpy(dev->buf, ev->data.ext.ptr, qlen);