diff options
| -rw-r--r-- | Documentation/media/v4l-drivers/cx88.rst | 1 | ||||
| -rw-r--r-- | Documentation/media/v4l-drivers/tm6000-cardlist.rst | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-core/dvb_math.h | 7 | ||||
| -rw-r--r-- | include/media/media-entity.h | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/media/v4l-drivers/cx88.rst b/Documentation/media/v4l-drivers/cx88.rst index 97865007f51f..d8f3a014726a 100644 --- a/Documentation/media/v4l-drivers/cx88.rst +++ b/Documentation/media/v4l-drivers/cx88.rst | |||
| @@ -119,6 +119,7 @@ GPIO 16(I believe) is tied to the IR port (if present). | |||
| 119 | From the data sheet: | 119 | From the data sheet: |
| 120 | 120 | ||
| 121 | - Register 24'h20004 PCI Interrupt Status | 121 | - Register 24'h20004 PCI Interrupt Status |
| 122 | |||
| 122 | - bit [18] IR_SMP_INT Set when 32 input samples have been collected over | 123 | - bit [18] IR_SMP_INT Set when 32 input samples have been collected over |
| 123 | - gpio[16] pin into GP_SAMPLE register. | 124 | - gpio[16] pin into GP_SAMPLE register. |
| 124 | 125 | ||
diff --git a/Documentation/media/v4l-drivers/tm6000-cardlist.rst b/Documentation/media/v4l-drivers/tm6000-cardlist.rst index ca08d4214b38..2fbd3886b5f0 100644 --- a/Documentation/media/v4l-drivers/tm6000-cardlist.rst +++ b/Documentation/media/v4l-drivers/tm6000-cardlist.rst | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | TM6000 cards list | 1 | TM6000 cards list |
| 2 | =============== | 2 | ================= |
| 3 | 3 | ||
| 4 | .. code-block:: none | 4 | .. code-block:: none |
| 5 | 5 | ||
diff --git a/drivers/media/dvb-core/dvb_math.h b/drivers/media/dvb-core/dvb_math.h index 34dc1df03cab..2f0326674ca6 100644 --- a/drivers/media/dvb-core/dvb_math.h +++ b/drivers/media/dvb-core/dvb_math.h | |||
| @@ -30,11 +30,15 @@ | |||
| 30 | * @value: The value (must be != 0) | 30 | * @value: The value (must be != 0) |
| 31 | * | 31 | * |
| 32 | * to use rational values you can use the following method: | 32 | * to use rational values you can use the following method: |
| 33 | * | ||
| 33 | * intlog2(value) = intlog2(value * 2^x) - x * 2^24 | 34 | * intlog2(value) = intlog2(value * 2^x) - x * 2^24 |
| 34 | * | 35 | * |
| 35 | * Some usecase examples: | 36 | * Some usecase examples: |
| 37 | * | ||
| 36 | * intlog2(8) will give 3 << 24 = 3 * 2^24 | 38 | * intlog2(8) will give 3 << 24 = 3 * 2^24 |
| 39 | * | ||
| 37 | * intlog2(9) will give 3 << 24 + ... = 3.16... * 2^24 | 40 | * intlog2(9) will give 3 << 24 + ... = 3.16... * 2^24 |
| 41 | * | ||
| 38 | * intlog2(1.5) = intlog2(3) - 2^24 = 0.584... * 2^24 | 42 | * intlog2(1.5) = intlog2(3) - 2^24 = 0.584... * 2^24 |
| 39 | * | 43 | * |
| 40 | * | 44 | * |
| @@ -48,10 +52,13 @@ extern unsigned int intlog2(u32 value); | |||
| 48 | * @value: The value (must be != 0) | 52 | * @value: The value (must be != 0) |
| 49 | * | 53 | * |
| 50 | * to use rational values you can use the following method: | 54 | * to use rational values you can use the following method: |
| 55 | * | ||
| 51 | * intlog10(value) = intlog10(value * 10^x) - x * 2^24 | 56 | * intlog10(value) = intlog10(value * 10^x) - x * 2^24 |
| 52 | * | 57 | * |
| 53 | * An usecase example: | 58 | * An usecase example: |
| 59 | * | ||
| 54 | * intlog10(1000) will give 3 << 24 = 3 * 2^24 | 60 | * intlog10(1000) will give 3 << 24 = 3 * 2^24 |
| 61 | * | ||
| 55 | * due to the implementation intlog10(1000) might be not exactly 3 * 2^24 | 62 | * due to the implementation intlog10(1000) might be not exactly 3 * 2^24 |
| 56 | * | 63 | * |
| 57 | * look at intlog2 for similar examples | 64 | * look at intlog2 for similar examples |
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 83877719bef4..3d885d97d149 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h | |||
| @@ -180,8 +180,10 @@ struct media_pad { | |||
| 180 | * view. The media_entity_pipeline_start() function | 180 | * view. The media_entity_pipeline_start() function |
| 181 | * validates all links by calling this operation. Optional. | 181 | * validates all links by calling this operation. Optional. |
| 182 | * | 182 | * |
| 183 | * .. note:: Those these callbacks are called with struct media_device.@graph_mutex | 183 | * .. note:: |
| 184 | * mutex held. | 184 | * |
| 185 | * Those these callbacks are called with struct media_device.@graph_mutex | ||
| 186 | * mutex held. | ||
| 185 | */ | 187 | */ |
| 186 | struct media_entity_operations { | 188 | struct media_entity_operations { |
| 187 | int (*link_setup)(struct media_entity *entity, | 189 | int (*link_setup)(struct media_entity *entity, |
