peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Trivial whitespace normalization in ieee1394.h and raw1394.h 

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2012-06-30 16:57:24 +02:00
parent 03faa97445
commit d4e754165e
2 changed files with 151 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/raw1394.h
View File

@ -475,7 +475,7 @@ raw1394handle_t raw1394_new_handle_on_port(int port);
* *
* Returns: 0 on success or -1 on failure (sets errno) * Returns: 0 on success or -1 on failure (sets errno)
**/ **/
int raw1394_busreset_notify (raw1394handle_t handle, int off_on_switch); int raw1394_busreset_notify(raw1394handle_t handle, int off_on_switch);
/** /**
* raw1394_get_fd - get the communication file descriptor * raw1394_get_fd - get the communication file descriptor
@ -535,9 +535,8 @@ nodeid_t raw1394_get_irm_id(raw1394handle_t handle);
* raw1394_get_nodecount - get number of nodes on the bus * raw1394_get_nodecount - get number of nodes on the bus
* @handle: libraw1394 handle * @handle: libraw1394 handle
* *
* Since the root node always has * Since the root node always has the highest node ID, this number can be used
* the highest node ID, this number can be used to determine that ID (it's * to determine that ID. (It is LOCAL_BUS|(count - 1).)
* LOCAL_BUS|(count-1)).
* *
* Returns: the number of nodes on the bus to which the handle is connected. * Returns: the number of nodes on the bus to which the handle is connected.
* This value can change with every bus reset. * This value can change with every bus reset.
@ -649,7 +648,7 @@ bus_reset_handler_t raw1394_set_bus_reset_handler(raw1394handle_t handle,
* raw1394_update_generation() has to be used for this. * raw1394_update_generation() has to be used for this.
* *
* Returns: the generation number associated with the handle or UINT_MAX on * Returns: the generation number associated with the handle or UINT_MAX on
* failure. * failure.
**/ **/
unsigned int raw1394_get_generation(raw1394handle_t handle); unsigned int raw1394_get_generation(raw1394handle_t handle);
@ -691,8 +690,8 @@ tag_handler_t raw1394_set_tag_handler(raw1394handle_t handle,
tag_handler_t new_h); tag_handler_t new_h);
typedef int (*arm_tag_handler_t)(raw1394handle_t handle, unsigned long arm_tag, typedef int (*arm_tag_handler_t)(raw1394handle_t handle, unsigned long arm_tag,
byte_t request_type, unsigned int requested_length, byte_t request_type,
void *data); unsigned int requested_length, void *data);
/** /**
* raw1394_set_arm_tag_handler - set the async request handler * raw1394_set_arm_tag_handler - set the async request handler
@ -725,7 +724,8 @@ typedef int (*fcp_handler_t)(raw1394handle_t, nodeid_t nodeid, int response,
* *
* Returns: the old handler or NULL on failure (sets errno) * Returns: the old handler or NULL on failure (sets errno)
**/ **/
fcp_handler_t raw1394_set_fcp_handler(raw1394handle_t handle, fcp_handler_t new_h); fcp_handler_t raw1394_set_fcp_handler(raw1394handle_t handle,
fcp_handler_t new_h);
/** /**
* typedef req_callback_t - This is the general request handler * typedef req_callback_t - This is the general request handler
@ -748,7 +748,7 @@ struct raw1394_reqhandle {
* Used by the default arm-tag handler (arm = address range mapping). * Used by the default arm-tag handler (arm = address range mapping).
* Called when a request has been received. * Called when a request has been received.
**/ **/
typedef int (*arm_req_callback_t) (raw1394handle_t, typedef int (*arm_req_callback_t)(raw1394handle_t,
struct raw1394_arm_request_response *arm_req_resp, struct raw1394_arm_request_response *arm_req_resp,
unsigned int requested_length, unsigned int requested_length,
void *pcontext, byte_t request_type); void *pcontext, byte_t request_type);
@ -759,15 +759,15 @@ struct raw1394_arm_reqhandle {
}; };
/** /**
* raw1394_arm_register - register an AddressRangeMapping * raw1394_arm_register - register an address range mapping
* @handle: libraw1394 handle * @handle: libraw1394 handle
* @start: identifies addressrange * @start: identifies address range
* @length: identifies addressrange * @length: identifies address range
* @initial_value: pointer to buffer containing (if necessary) initial value * @initial_value: pointer to buffer containing (if necessary) initial value
* NULL means undefined * NULL means undefined
* @arm_tag: identifier for arm_tag_handler * @arm_tag: identifier for arm_tag_handler
* (usually pointer to raw1394_arm_reqhandle) * (usually pointer to raw1394_arm_reqhandle)
* @access_rights: access-rights for registered addressrange handled * @access_rights: access-rights for registered address range handled
* by kernel-part. Value is one or more binary or of the * by kernel-part. Value is one or more binary or of the
* following flags - ARM_READ, ARM_WRITE, ARM_LOCK * following flags - ARM_READ, ARM_WRITE, ARM_LOCK
* @notification_options: identifies for which type of request you want * @notification_options: identifies for which type of request you want
@ -792,9 +792,9 @@ int raw1394_arm_register(raw1394handle_t handle, nodeaddr_t start,
arm_options_t notification_options, arm_options_t notification_options,
arm_options_t client_transactions); arm_options_t client_transactions);
/** /**
* raw1394_arm_unregister - unregister an AddressRangeMapping * raw1394_arm_unregister - unregister an address range mapping
* @handle: libraw1394 handle * @handle: libraw1394 handle
* @start: identifies addressrange for unregistering * @start: identifies address range for unregistering
* (value of start have to be the same value * (value of start have to be the same value
* used for registering this adressrange) * used for registering this adressrange)
* *
@ -805,8 +805,8 @@ int raw1394_arm_unregister(raw1394handle_t handle, nodeaddr_t start);
/** /**
* raw1394_arm_set_buf - set the buffer of an AdressRangeMapping * raw1394_arm_set_buf - set the buffer of an AdressRangeMapping
* @handle: libraw1394 handle * @handle: libraw1394 handle
* @start: identifies addressrange * @start: identifies address range
* @length: identifies addressrange * @length: identifies address range
* @buf: pointer to buffer * @buf: pointer to buffer
* *
* This function copies @length bytes from user memory area @buf * This function copies @length bytes from user memory area @buf
@ -815,14 +815,14 @@ int raw1394_arm_unregister(raw1394handle_t handle, nodeaddr_t start);
* *
* Returns: 0 on success or -1 on failure (sets errno) * Returns: 0 on success or -1 on failure (sets errno)
**/ **/
int raw1394_arm_set_buf (raw1394handle_t handle, nodeaddr_t start, int raw1394_arm_set_buf(raw1394handle_t handle, nodeaddr_t start,
size_t length, void *buf); size_t length, void *buf);
/** /**
* raw1394_arm_get_buf - get the buffer of an AdressRangeMapping * raw1394_arm_get_buf - get the buffer of an address range mapping
* @handle: libraw1394 handle * @handle: libraw1394 handle
* @start: identifies addressrange * @start: identifies address range
* @length: identifies addressrange * @length: identifies address range
* @buf: pointer to buffer * @buf: pointer to buffer
* *
* This function copies @length bytes from one * This function copies @length bytes from one
@ -831,7 +831,7 @@ int raw1394_arm_set_buf (raw1394handle_t handle, nodeaddr_t start,
* *
* Returns: 0 on success or -1 on failure (sets errno) * Returns: 0 on success or -1 on failure (sets errno)
**/ **/
int raw1394_arm_get_buf (raw1394handle_t handle, nodeaddr_t start, int raw1394_arm_get_buf(raw1394handle_t handle, nodeaddr_t start,
size_t length, void *buf); size_t length, void *buf);
/** /**
@ -858,7 +858,6 @@ int raw1394_echo_request(raw1394handle_t handle, quadlet_t data);
**/ **/
int raw1394_wake_up(raw1394handle_t handle); int raw1394_wake_up(raw1394handle_t handle);
/** /**
* raw1394_phy_packet_write - send physical request * raw1394_phy_packet_write - send physical request
* @handle: libraw1394 handle * @handle: libraw1394 handle
@ -868,7 +867,7 @@ int raw1394_wake_up(raw1394handle_t handle);
* *
* Returns: 0 on success or -1 on failure (sets errno) * Returns: 0 on success or -1 on failure (sets errno)
**/ **/
int raw1394_phy_packet_write (raw1394handle_t handle, quadlet_t data); int raw1394_phy_packet_write(raw1394handle_t handle, quadlet_t data);
/** /**
* raw1394_start_phy_packet_write - initiate sending a physical request * raw1394_start_phy_packet_write - initiate sending a physical request
@ -999,8 +998,8 @@ int raw1394_start_lock64(raw1394handle_t handle, nodeid_t node, nodeaddr_t addr,
**/ **/
int raw1394_start_async_stream(raw1394handle_t handle, unsigned int channel, int raw1394_start_async_stream(raw1394handle_t handle, unsigned int channel,
unsigned int tag, unsigned int sy, unsigned int tag, unsigned int sy,
unsigned int speed, size_t length, quadlet_t *data, unsigned int speed, size_t length,
unsigned long rawtag); quadlet_t *data, unsigned long rawtag);
/** /**
@ -1164,7 +1163,6 @@ int raw1394_start_fcp_listen(raw1394handle_t handle);
**/ **/
int raw1394_stop_fcp_listen(raw1394handle_t handle); int raw1394_stop_fcp_listen(raw1394handle_t handle);
/** /**
* raw1394_get_libversion - Returns the version string * raw1394_get_libversion - Returns the version string
* *
@ -1175,7 +1173,6 @@ int raw1394_stop_fcp_listen(raw1394handle_t handle);
*/ */
const char *raw1394_get_libversion(void); const char *raw1394_get_libversion(void);
/** /**
* raw1394_update_config_rom - updates the configuration ROM of a host * raw1394_update_config_rom - updates the configuration ROM of a host
* @handle: libraw1394 handle * @handle: libraw1394 handle
@ -1192,9 +1189,8 @@ const char *raw1394_get_libversion(void);
* *
* This function always fails on current kernels. * This function always fails on current kernels.
**/ **/
int raw1394_update_config_rom(raw1394handle_t handle, const quadlet_t *new_rom,
int raw1394_update_config_rom(raw1394handle_t handle, const quadlet_t size_t size, unsigned char rom_version);
*new_rom, size_t size, unsigned char rom_version);
/** /**
* raw1394_add_config_rom_descriptor - add contents to local Configuration ROM * raw1394_add_config_rom_descriptor - add contents to local Configuration ROM
@ -1269,8 +1265,9 @@ int raw1394_remove_config_rom_descriptor(raw1394handle_t handle,
* Return: -1 (failure) if the buffer was too small or 0 for success * Return: -1 (failure) if the buffer was too small or 0 for success
**/ **/
int raw1394_get_config_rom(raw1394handle_t handle, quadlet_t *buffer, int raw1394_get_config_rom(raw1394handle_t handle,
size_t buffersize, size_t *rom_size, unsigned char *rom_version); quadlet_t *buffer, size_t buffersize,
size_t *rom_size, unsigned char *rom_version);
/** /**
* raw1394_bandwidth_modify - allocate or release bandwidth * raw1394_bandwidth_modify - allocate or release bandwidth
@ -1283,8 +1280,7 @@ int raw1394_get_config_rom(raw1394handle_t handle, quadlet_t *buffer,
* Return: * Return:
* -1 for failure, 0 for success * -1 for failure, 0 for success
**/ **/
int int raw1394_bandwidth_modify(raw1394handle_t handle, unsigned int bandwidth,
raw1394_bandwidth_modify (raw1394handle_t handle, unsigned int bandwidth,
enum raw1394_modify_mode mode); enum raw1394_modify_mode mode);
/** /**
@ -1298,11 +1294,9 @@ raw1394_bandwidth_modify (raw1394handle_t handle, unsigned int bandwidth,
* Return: * Return:
* -1 for failure, 0 for success * -1 for failure, 0 for success
**/ **/
int int raw1394_channel_modify(raw1394handle_t handle, unsigned int channel,
raw1394_channel_modify (raw1394handle_t handle, unsigned int channel,
enum raw1394_modify_mode mode); enum raw1394_modify_mode mode);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif