Permalink
Browse files

consumer_ir: add array length to get carrier freq

Change-Id: Iefb424db6f16ffefa40da56c765c9b7a24bea397
  • Loading branch information...
1 parent c900b42 commit d9d105a0ce6bbaa8d1d1cf70a255612a5dd33701 @machinaut machinaut committed Sep 11, 2013
Showing with 8 additions and 5 deletions.
  1. +2 −2 include/hardware/consumerir.h
  2. +6 −3 modules/consumerir/consumerir.c
@@ -66,12 +66,12 @@ typedef struct consumerir_device {
* (*get_carrier_freqs)() is called by the ConsumerIrService to enumerate
* which frequencies the IR transmitter supports. The HAL implementation
* should fill an array of consumerir_freq_range structs with the
- * appropriate values for the transmitter.
+ * appropriate values for the transmitter, up to len elements.
*
* returns: the number of ranges on success. A negative error code on error.
*/
int (*get_carrier_freqs)(struct consumerir_device *dev,
- consumerir_freq_range_t *ranges);
+ size_t len, consumerir_freq_range_t *ranges);
/* Reserved for future use. Must be NULL. */
void* reserved[8 - 3];
@@ -54,10 +54,13 @@ static int consumerir_get_num_carrier_freqs(struct consumerir_device *dev)
}
static int consumerir_get_carrier_freqs(struct consumerir_device *dev,
- consumerir_freq_range_t *ranges)
+ size_t len, consumerir_freq_range_t *ranges)
{
- memcpy(ranges, consumerir_freqs, sizeof(consumerir_freqs));
- return ARRAY_SIZE(consumerir_freqs);
+ size_t to_copy = ARRAY_SIZE(consumerir_freqs);
+
+ to_copy = len < to_copy ? len : to_copy;
+ memcpy(ranges, consumerir_freqs, to_copy * sizeof(consumerir_freq_range_t));
+ return to_copy;
}
static int consumerir_close(hw_device_t *dev)

0 comments on commit d9d105a

Please sign in to comment.