Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] DocBook: add dvb_ca_en50221.h to documentation

There are already some tags at dvb_ca_en50221.h, but using a
different format. Convert them, fix a few entries and add
to the device-drivers DocBook.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>

+102 -101
+1 -1
Documentation/DocBook/device-drivers.tmpl
··· 227 227 !Iinclude/media/v4l2-of.h 228 228 !Iinclude/media/v4l2-subdev.h 229 229 !Iinclude/media/rc-core.h 230 + !Idrivers/media/dvb-core/dvb_ca_en50221.h 230 231 <!-- FIXME: Removed for now due to document generation inconsistency 231 232 X!Iinclude/media/v4l2-ctrls.h 232 233 X!Iinclude/media/v4l2-dv-timings.h ··· 241 240 X!Idrivers/media/dvb-core/dvbdev.h 242 241 X!Edrivers/media/dvb-core/dvb_net.c 243 242 X!Idrivers/media/dvb-core/dvb_ringbuffer.h 244 - X!Idrivers/media/dvb-core/dvb_ca_en50221.h 245 243 X!Idrivers/media/dvb-core/dvb_math.h 246 244 --> 247 245
+84 -83
drivers/media/dvb-core/dvb_ca_en50221.c
··· 169 169 /** 170 170 * Safely find needle in haystack. 171 171 * 172 - * @param haystack Buffer to look in. 173 - * @param hlen Number of bytes in haystack. 174 - * @param needle Buffer to find. 175 - * @param nlen Number of bytes in needle. 172 + * @haystack: Buffer to look in. 173 + * @hlen: Number of bytes in haystack. 174 + * @needle: Buffer to find. 175 + * @nlen: Number of bytes in needle. 176 176 * @return Pointer into haystack needle was found at, or NULL if not found. 177 177 */ 178 178 static char *findstr(char * haystack, int hlen, char * needle, int nlen) ··· 197 197 198 198 199 199 /** 200 - * Check CAM status. 200 + * dvb_ca_en50221_check_camstatus - Check CAM status. 201 201 */ 202 202 static int dvb_ca_en50221_check_camstatus(struct dvb_ca_private *ca, int slot) 203 203 { ··· 240 240 241 241 242 242 /** 243 - * Wait for flags to become set on the STATUS register on a CAM interface, 244 - * checking for errors and timeout. 243 + * dvb_ca_en50221_wait_if_status - Wait for flags to become set on the STATUS 244 + * register on a CAM interface, checking for errors and timeout. 245 245 * 246 - * @param ca CA instance. 247 - * @param slot Slot on interface. 248 - * @param waitfor Flags to wait for. 249 - * @param timeout_ms Timeout in milliseconds. 246 + * @ca: CA instance. 247 + * @slot: Slot on interface. 248 + * @waitfor: Flags to wait for. 249 + * @timeout_ms: Timeout in milliseconds. 250 250 * 251 251 * @return 0 on success, nonzero on error. 252 252 */ ··· 290 290 291 291 292 292 /** 293 - * Initialise the link layer connection to a CAM. 293 + * dvb_ca_en50221_link_init - Initialise the link layer connection to a CAM. 294 294 * 295 - * @param ca CA instance. 296 - * @param slot Slot id. 295 + * @ca: CA instance. 296 + * @slot: Slot id. 297 297 * 298 298 * @return 0 on success, nonzero on failure. 299 299 */ ··· 346 346 } 347 347 348 348 /** 349 - * Read a tuple from attribute memory. 349 + * dvb_ca_en50221_read_tuple - Read a tuple from attribute memory. 350 350 * 351 - * @param ca CA instance. 352 - * @param slot Slot id. 353 - * @param address Address to read from. Updated. 354 - * @param tupleType Tuple id byte. Updated. 355 - * @param tupleLength Tuple length. Updated. 356 - * @param tuple Dest buffer for tuple (must be 256 bytes). Updated. 351 + * @ca: CA instance. 352 + * @slot: Slot id. 353 + * @address: Address to read from. Updated. 354 + * @tupleType: Tuple id byte. Updated. 355 + * @tupleLength: Tuple length. Updated. 356 + * @tuple: Dest buffer for tuple (must be 256 bytes). Updated. 357 357 * 358 358 * @return 0 on success, nonzero on error. 359 359 */ ··· 399 399 400 400 401 401 /** 402 - * Parse attribute memory of a CAM module, extracting Config register, and checking 403 - * it is a DVB CAM module. 402 + * dvb_ca_en50221_parse_attributes - Parse attribute memory of a CAM module, 403 + * extracting Config register, and checking it is a DVB CAM module. 404 404 * 405 - * @param ca CA instance. 406 - * @param slot Slot id. 405 + * @ca: CA instance. 406 + * @slot: Slot id. 407 407 * 408 408 * @return 0 on success, <0 on failure. 409 409 */ ··· 546 546 547 547 548 548 /** 549 - * Set CAM's configoption correctly. 549 + * dvb_ca_en50221_set_configoption - Set CAM's configoption correctly. 550 550 * 551 - * @param ca CA instance. 552 - * @param slot Slot containing the CAM. 551 + * @ca: CA instance. 552 + * @slot: Slot containing the CAM. 553 553 */ 554 554 static int dvb_ca_en50221_set_configoption(struct dvb_ca_private *ca, int slot) 555 555 { ··· 574 574 575 575 576 576 /** 577 - * This function talks to an EN50221 CAM control interface. It reads a buffer of 578 - * data from the CAM. The data can either be stored in a supplied buffer, or 579 - * automatically be added to the slot's rx_buffer. 577 + * dvb_ca_en50221_read_data - This function talks to an EN50221 CAM control 578 + * interface. It reads a buffer of data from the CAM. The data can either 579 + * be stored in a supplied buffer, or automatically be added to the slot's 580 + * rx_buffer. 580 581 * 581 - * @param ca CA instance. 582 - * @param slot Slot to read from. 583 - * @param ebuf If non-NULL, the data will be written to this buffer. If NULL, 582 + * @ca: CA instance. 583 + * @slot: Slot to read from. 584 + * @ebuf: If non-NULL, the data will be written to this buffer. If NULL, 584 585 * the data will be added into the buffering system as a normal fragment. 585 - * @param ecount Size of ebuf. Ignored if ebuf is NULL. 586 + * @ecount: Size of ebuf. Ignored if ebuf is NULL. 586 587 * 587 588 * @return Number of bytes read, or < 0 on error 588 589 */ ··· 699 698 700 699 701 700 /** 702 - * This function talks to an EN50221 CAM control interface. It writes a buffer of data 703 - * to a CAM. 701 + * dvb_ca_en50221_write_data - This function talks to an EN50221 CAM control 702 + * interface. It writes a buffer of data to a CAM. 704 703 * 705 - * @param ca CA instance. 706 - * @param slot Slot to write to. 707 - * @param ebuf The data in this buffer is treated as a complete link-level packet to 704 + * @ca: CA instance. 705 + * @slot: Slot to write to. 706 + * @ebuf: The data in this buffer is treated as a complete link-level packet to 708 707 * be written. 709 - * @param count Size of ebuf. 708 + * @count: Size of ebuf. 710 709 * 711 710 * @return Number of bytes written, or < 0 on error. 712 711 */ ··· 791 790 792 791 793 792 /** 794 - * A CAM has been removed => shut it down. 793 + * dvb_ca_en50221_camready_irq - A CAM has been removed => shut it down. 795 794 * 796 - * @param ca CA instance. 797 - * @param slot Slot to shut down. 795 + * @ca: CA instance. 796 + * @slot: Slot to shut down. 798 797 */ 799 798 static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot) 800 799 { ··· 816 815 817 816 818 817 /** 819 - * A CAMCHANGE IRQ has occurred. 818 + * dvb_ca_en50221_camready_irq - A CAMCHANGE IRQ has occurred. 820 819 * 821 - * @param ca CA instance. 822 - * @param slot Slot concerned. 823 - * @param change_type One of the DVB_CA_CAMCHANGE_* values. 820 + * @ca: CA instance. 821 + * @slot: Slot concerned. 822 + * @change_type: One of the DVB_CA_CAMCHANGE_* values. 824 823 */ 825 824 void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot, int change_type) 826 825 { ··· 845 844 846 845 847 846 /** 848 - * A CAMREADY IRQ has occurred. 847 + * dvb_ca_en50221_camready_irq - A CAMREADY IRQ has occurred. 849 848 * 850 - * @param ca CA instance. 851 - * @param slot Slot concerned. 849 + * @ca: CA instance. 850 + * @slot: Slot concerned. 852 851 */ 853 852 void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot) 854 853 { ··· 866 865 /** 867 866 * An FR or DA IRQ has occurred. 868 867 * 869 - * @param ca CA instance. 870 - * @param slot Slot concerned. 868 + * @ca: CA instance. 869 + * @slot: Slot concerned. 871 870 */ 872 871 void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot) 873 872 { ··· 900 899 /** 901 900 * Wake up the DVB CA thread 902 901 * 903 - * @param ca CA instance. 902 + * @ca: CA instance. 904 903 */ 905 904 static void dvb_ca_en50221_thread_wakeup(struct dvb_ca_private *ca) 906 905 { ··· 915 914 /** 916 915 * Update the delay used by the thread. 917 916 * 918 - * @param ca CA instance. 917 + * @ca: CA instance. 919 918 */ 920 919 static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca) 921 920 { ··· 1178 1177 * Real ioctl implementation. 1179 1178 * NOTE: CA_SEND_MSG/CA_GET_MSG ioctls have userspace buffers passed to them. 1180 1179 * 1181 - * @param inode Inode concerned. 1182 - * @param file File concerned. 1183 - * @param cmd IOCTL command. 1184 - * @param arg Associated argument. 1180 + * @inode: Inode concerned. 1181 + * @file: File concerned. 1182 + * @cmd: IOCTL command. 1183 + * @arg: Associated argument. 1185 1184 * 1186 1185 * @return 0 on success, <0 on error. 1187 1186 */ ··· 1259 1258 /** 1260 1259 * Wrapper for ioctl implementation. 1261 1260 * 1262 - * @param inode Inode concerned. 1263 - * @param file File concerned. 1264 - * @param cmd IOCTL command. 1265 - * @param arg Associated argument. 1261 + * @inode: Inode concerned. 1262 + * @file: File concerned. 1263 + * @cmd: IOCTL command. 1264 + * @arg: Associated argument. 1266 1265 * 1267 1266 * @return 0 on success, <0 on error. 1268 1267 */ ··· 1276 1275 /** 1277 1276 * Implementation of write() syscall. 1278 1277 * 1279 - * @param file File structure. 1280 - * @param buf Source buffer. 1281 - * @param count Size of source buffer. 1282 - * @param ppos Position in file (ignored). 1278 + * @file: File structure. 1279 + * @buf: Source buffer. 1280 + * @count: Size of source buffer. 1281 + * @ppos: Position in file (ignored). 1283 1282 * 1284 1283 * @return Number of bytes read, or <0 on error. 1285 1284 */ ··· 1417 1416 /** 1418 1417 * Implementation of read() syscall. 1419 1418 * 1420 - * @param file File structure. 1421 - * @param buf Destination buffer. 1422 - * @param count Size of destination buffer. 1423 - * @param ppos Position in file (ignored). 1419 + * @file: File structure. 1420 + * @buf: Destination buffer. 1421 + * @count: Size of destination buffer. 1422 + * @ppos: Position in file (ignored). 1424 1423 * 1425 1424 * @return Number of bytes read, or <0 on error. 1426 1425 */ ··· 1520 1519 /** 1521 1520 * Implementation of file open syscall. 1522 1521 * 1523 - * @param inode Inode concerned. 1524 - * @param file File concerned. 1522 + * @inode: Inode concerned. 1523 + * @file: File concerned. 1525 1524 * 1526 1525 * @return 0 on success, <0 on failure. 1527 1526 */ ··· 1565 1564 /** 1566 1565 * Implementation of file close syscall. 1567 1566 * 1568 - * @param inode Inode concerned. 1569 - * @param file File concerned. 1567 + * @inode: Inode concerned. 1568 + * @file: File concerned. 1570 1569 * 1571 1570 * @return 0 on success, <0 on failure. 1572 1571 */ ··· 1593 1592 /** 1594 1593 * Implementation of poll() syscall. 1595 1594 * 1596 - * @param file File concerned. 1597 - * @param wait poll wait table. 1595 + * @file: File concerned. 1596 + * @wait: poll wait table. 1598 1597 * 1599 1598 * @return Standard poll mask. 1600 1599 */ ··· 1657 1656 /** 1658 1657 * Initialise a new DVB CA EN50221 interface device. 1659 1658 * 1660 - * @param dvb_adapter DVB adapter to attach the new CA device to. 1661 - * @param ca The dvb_ca instance. 1662 - * @param flags Flags describing the CA device (DVB_CA_FLAG_*). 1663 - * @param slot_count Number of slots supported. 1659 + * @dvb_adapter: DVB adapter to attach the new CA device to. 1660 + * @ca: The dvb_ca instance. 1661 + * @flags: Flags describing the CA device (DVB_CA_FLAG_*). 1662 + * @slot_count: Number of slots supported. 1664 1663 * 1665 1664 * @return 0 on success, nonzero on failure 1666 1665 */ ··· 1744 1743 /** 1745 1744 * Release a DVB CA EN50221 interface device. 1746 1745 * 1747 - * @param ca_dev The dvb_device_t instance for the CA device. 1748 - * @param ca The associated dvb_ca instance. 1746 + * @ca_dev: The dvb_device_t instance for the CA device. 1747 + * @ca: The associated dvb_ca instance. 1749 1748 */ 1750 1749 void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca) 1751 1750 {
+17 -17
drivers/media/dvb-core/dvb_ca_en50221.h
··· 83 83 /* Functions for reporting IRQ events */ 84 84 85 85 /** 86 - * A CAMCHANGE IRQ has occurred. 86 + * dvb_ca_en50221_camchange_irq - A CAMCHANGE IRQ has occurred. 87 87 * 88 - * @param ca CA instance. 89 - * @param slot Slot concerned. 90 - * @param change_type One of the DVB_CA_CAMCHANGE_* values 88 + * @pubca: CA instance. 89 + * @slot: Slot concerned. 90 + * @change_type: One of the DVB_CA_CAMCHANGE_* values 91 91 */ 92 92 void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221* pubca, int slot, int change_type); 93 93 94 94 /** 95 - * A CAMREADY IRQ has occurred. 95 + * dvb_ca_en50221_camready_irq - A CAMREADY IRQ has occurred. 96 96 * 97 - * @param ca CA instance. 98 - * @param slot Slot concerned. 97 + * @pubca: CA instance. 98 + * @slot: Slot concerned. 99 99 */ 100 100 void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221* pubca, int slot); 101 101 102 102 /** 103 - * An FR or a DA IRQ has occurred. 103 + * dvb_ca_en50221_frda_irq - An FR or a DA IRQ has occurred. 104 104 * 105 - * @param ca CA instance. 106 - * @param slot Slot concerned. 105 + * @ca: CA instance. 106 + * @slot: Slot concerned. 107 107 */ 108 108 void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221* ca, int slot); 109 109 ··· 113 113 /* Initialisation/shutdown functions */ 114 114 115 115 /** 116 - * Initialise a new DVB CA device. 116 + * dvb_ca_en50221_init - Initialise a new DVB CA device. 117 117 * 118 - * @param dvb_adapter DVB adapter to attach the new CA device to. 119 - * @param ca The dvb_ca instance. 120 - * @param flags Flags describing the CA device (DVB_CA_EN50221_FLAG_*). 121 - * @param slot_count Number of slots supported. 118 + * @dvb_adapter: DVB adapter to attach the new CA device to. 119 + * @ca: The dvb_ca instance. 120 + * @flags: Flags describing the CA device (DVB_CA_EN50221_FLAG_*). 121 + * @slot_count: Number of slots supported. 122 122 * 123 123 * @return 0 on success, nonzero on failure 124 124 */ 125 125 extern int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, struct dvb_ca_en50221* ca, int flags, int slot_count); 126 126 127 127 /** 128 - * Release a DVB CA device. 128 + * dvb_ca_en50221_release - Release a DVB CA device. 129 129 * 130 - * @param ca The associated dvb_ca instance. 130 + * @ca: The associated dvb_ca instance. 131 131 */ 132 132 extern void dvb_ca_en50221_release(struct dvb_ca_en50221* ca); 133 133