Skip to contentSkip to conversation

staging: vc04_services: bcm2835-camera: use BIT macro

PATCH Superseded Keerthi Reddy 3 participants 3 messages Sep 27, 2017

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: vc04_services: bcm2835-camera: use BIT macro

As suggested by Stefan, I split this commit from the previous patchset.

This commit changes left shift operator to use BIT macro

---
 .../vc04_services/bcm2835-camera/mmal-msg.h        | 22 +++++++++++-----------
 .../vc04_services/bcm2835-camera/mmal-parameters.h |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +11 -11
index 1144d9d..5a1b2a7 100644
@@ -217,36 +217,36 @@ struct mmal_msg_port_action_reply {
 #define MMAL_VC_SHORT_DATA 128
 
 /** Signals that the current payload is the end of the stream of data */
-#define MMAL_BUFFER_HEADER_FLAG_EOS                    (1<<0)
+#define MMAL_BUFFER_HEADER_FLAG_EOS                    BIT(0)
 /** Signals that the start of the current payload starts a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            (1<<1)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            BIT(1)
 /** Signals that the end of the current payload ends a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              (1<<2)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)
 /** Signals that the current payload contains only complete frames (>1) */
 #define MMAL_BUFFER_HEADER_FLAG_FRAME                  \
 	(MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)
 /** Signals that the current payload is a keyframe (i.e. self decodable) */
-#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               (1<<3)
+#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               BIT(3)
 /** Signals a discontinuity in the stream of data (e.g. after a seek).
  * Can be used for instance by a decoder to reset its state
  */
-#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          (1<<4)
+#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          BIT(4)
 /** Signals a buffer containing some kind of config data for the component
  * (e.g. codec config data)
  */
-#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 (1<<5)
+#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 BIT(5)
 /** Signals an encrypted payload */
-#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              (1<<6)
+#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              BIT(6)
 /** Signals a buffer containing side information */
-#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          (1<<7)
+#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          BIT(7)
 /** Signals a buffer which is the snapshot/postview image from a stills
  * capture
  */
-#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              (1<<8)
+#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              BIT(8)
 /** Signals a buffer which contains data known to be corrupted */
-#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              (1<<9)
+#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              BIT(9)
 /** Signals that a buffer failed to be transmitted */
-#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    (1<<10)
+#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    BIT(10)
 
 struct mmal_driver_buffer {
 	u32 magic;
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +1 -1
index e730022..1967fd1 100644
@@ -24,7 +24,7 @@
 /** Common parameter ID group, used with many types of component. */
 #define MMAL_PARAMETER_GROUP_COMMON            (0<<16)
 /** Camera-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_CAMERA            (1<<16)
+#define MMAL_PARAMETER_GROUP_CAMERA            BIT(16)
 /** Video-specific parameter ID group. */
 #define MMAL_PARAMETER_GROUP_VIDEO             (2<<16)
 /** Audio-specific parameter ID group. */
Signature · 1 line
2.7.4
#1 lore raw

Hi Kerrthi,

Quoted 29 lines

Keerthi Reddy <[email protected]> hat am 27. September 2017 um 19:39 geschrieben:

As suggested by Stefan, I split this commit from the previous patchset.

This commit changes left shift operator to use BIT macro

---
 .../vc04_services/bcm2835-camera/mmal-msg.h        | 22 +++++++++++-----------
 .../vc04_services/bcm2835-camera/mmal-parameters.h |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +0 -0
index 1144d9d..5a1b2a7 100644
@@ -217,36 +217,36 @@ struct mmal_msg_port_action_reply {
 #define MMAL_VC_SHORT_DATA 128
 
...
 struct mmal_driver_buffer {
 	u32 magic;
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +0 -0
index e730022..1967fd1 100644

drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h line 27

Quoted 5 lines
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +1 -1
@@ -24,7 +24,7 @@
 /** Common parameter ID group, used with many types of component. */
 #define MMAL_PARAMETER_GROUP_COMMON            (0<<16)
 /** Camera-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_CAMERA            (1<<16)
+#define MMAL_PARAMETER_GROUP_CAMERA            BIT(16)

since these defines aren't flags, so please don't use the BIT macro in this particular case. The other ones are okay.

Best regards

Quoted 6 lines
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +0 -0
 /** Video-specific parameter ID group. */
 #define MMAL_PARAMETER_GROUP_VIDEO             (2<<16)
 /** Audio-specific parameter ID group. */
Signature · 1 line
2.7.4
#2 lore raw
In reply to Keerthi Reddy
Quoted 68 lines · Keerthi Reddy

As suggested by Stefan, I split this commit from the previous patchset.

This commit changes left shift operator to use BIT macro

---
 .../vc04_services/bcm2835-camera/mmal-msg.h        | 22 +++++++++++-----------
 .../vc04_services/bcm2835-camera/mmal-parameters.h |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +11 -11
index 1144d9d..5a1b2a7 100644
@@ -217,36 +217,36 @@ struct mmal_msg_port_action_reply {
 #define MMAL_VC_SHORT_DATA 128
 
 /** Signals that the current payload is the end of the stream of data */
-#define MMAL_BUFFER_HEADER_FLAG_EOS                    (1<<0)
+#define MMAL_BUFFER_HEADER_FLAG_EOS                    BIT(0)
 /** Signals that the start of the current payload starts a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            (1<<1)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            BIT(1)
 /** Signals that the end of the current payload ends a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              (1<<2)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)
 /** Signals that the current payload contains only complete frames (>1) */
 #define MMAL_BUFFER_HEADER_FLAG_FRAME                  \
 	(MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)
 /** Signals that the current payload is a keyframe (i.e. self decodable) */
-#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               (1<<3)
+#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               BIT(3)
 /** Signals a discontinuity in the stream of data (e.g. after a seek).
  * Can be used for instance by a decoder to reset its state
  */
-#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          (1<<4)
+#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          BIT(4)
 /** Signals a buffer containing some kind of config data for the component
  * (e.g. codec config data)
  */
-#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 (1<<5)
+#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 BIT(5)
 /** Signals an encrypted payload */
-#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              (1<<6)
+#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              BIT(6)
 /** Signals a buffer containing side information */
-#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          (1<<7)
+#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          BIT(7)
 /** Signals a buffer which is the snapshot/postview image from a stills
  * capture
  */
-#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              (1<<8)
+#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              BIT(8)
 /** Signals a buffer which contains data known to be corrupted */
-#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              (1<<9)
+#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              BIT(9)
 /** Signals that a buffer failed to be transmitted */
-#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    (1<<10)
+#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    BIT(10)
 
 struct mmal_driver_buffer {
 	u32 magic;
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +0 -0
index e730022..1967fd1 100644

drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h line 27

Quoted 5 lines
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +1 -1
@@ -24,7 +24,7 @@
 /** Common parameter ID group, used with many types of component. */
 #define MMAL_PARAMETER_GROUP_COMMON            (0<<16)
 /** Camera-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_CAMERA            (1<<16)
+#define MMAL_PARAMETER_GROUP_CAMERA            BIT(16)

Don't do this one. The values should be defined in a uniform way.

julia

Quoted 13 lines
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +0 -1
 /** Video-specific parameter ID group. */
 #define MMAL_PARAMETER_GROUP_VIDEO             (2<<16)
 /** Audio-specific parameter ID group. */
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170927173948.GA4829%40manoharreddy.
For more options, visit https://groups.google.com/d/optout.