diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-04-14 17:10:56 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-04-14 17:10:56 +0000 |
| commit | cea421d04b89cee8285b93d46326bbefb58566b7 (patch) | |
| tree | c3b5c9d2f4cf206b6947b0a8da1554787cb84466 /linux/include | |
| parent | 98bd04299fa94ff61e8e2e1e3b8bee3cd924bb4c (diff) | |
| download | mediapointer-dvb-s2-cea421d04b89cee8285b93d46326bbefb58566b7.tar.gz mediapointer-dvb-s2-cea421d04b89cee8285b93d46326bbefb58566b7.tar.bz2 | |
- rename FEEDTYPE_SEC/TS to DVB_NET_FEEDTYPE_MPE/ULE
- add binary compatibility cruft
- return feedtype in NET_GET_IF
- check feedtype for validity in NET_ADD_IF
- fix a copy&paste bug in dvb_net_add_if() 2.4 vs. 2.6
- formatting and coding style fixes
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/dvb/net.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/linux/include/linux/dvb/net.h b/linux/include/linux/dvb/net.h index ba44c6188..f9ec12062 100644 --- a/linux/include/linux/dvb/net.h +++ b/linux/include/linux/dvb/net.h @@ -1,4 +1,4 @@ -/* +/* * net.h * * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> @@ -31,14 +31,23 @@ struct dvb_net_if { __u16 pid; __u16 if_num; __u8 feedtype; -#define FEEDTYPE_SEC 0 -#define FEEDTYPE_TS 1 +#define DVB_NET_FEEDTYPE_MPE 0 /* multi protocol encapsulation */ +#define DVB_NET_FEEDTYPE_ULE 1 /* ultra lightweight encapsulation */ }; -#define NET_ADD_IF _IOWR('o', 52, struct dvb_net_if) -#define NET_REMOVE_IF _IO('o', 53) -#define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) +#define NET_ADD_IF _IOWR('o', 52, struct dvb_net_if) +#define NET_REMOVE_IF _IO('o', 53) +#define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) -#endif /*_DVBNET_H_*/ +/* binary compatibility cruft: */ +struct __dvb_net_if_old { + __u16 pid; + __u16 if_num; +}; +#define __NET_ADD_IF_OLD _IOWR('o', 52, struct __dvb_net_if_old) +#define __NET_GET_IF_OLD _IOWR('o', 54, struct __dvb_net_if_old) + + +#endif /*_DVBNET_H_*/ |