projects
/
gspca_kinect.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings from linux-2.6/scripts/checkpatch.pl
[gspca_kinect.git]
/
kinect.c
diff --git
a/kinect.c
b/kinect.c
index
6c16413
..
f85e746
100644
(file)
--- a/
kinect.c
+++ b/
kinect.c
@@
-50,12
+50,12
@@
struct pkt_hdr {
uint32_t timestamp;
};
uint32_t timestamp;
};
-
typedef struct
{
+
struct cam_hdr
{
uint8_t magic[2];
uint16_t len;
uint16_t cmd;
uint16_t tag;
uint8_t magic[2];
uint16_t len;
uint16_t cmd;
uint16_t tag;
-}
cam_hdr
;
+};
/* specific webcam descriptor */
struct sd {
/* specific webcam descriptor */
struct sd {
@@
-108,7
+108,8
@@
static const struct v4l2_pix_format video_camera_mode[] = {
.priv = MODE_1280x1024 | FORMAT_Y10B},
};
.priv = MODE_1280x1024 | FORMAT_Y10B},
};
-static int kinect_write(struct usb_device *udev, uint8_t *data, uint16_t wLength)
+static int kinect_write(struct usb_device *udev, uint8_t *data,
+ uint16_t wLength)
{
return usb_control_msg(udev,
usb_sndctrlpipe(udev, 0),
{
return usb_control_msg(udev,
usb_sndctrlpipe(udev, 0),
@@
-134,8
+135,8
@@
static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf,
int res, actual_len;
uint8_t obuf[0x400];
uint8_t ibuf[0x200];
int res, actual_len;
uint8_t obuf[0x400];
uint8_t ibuf[0x200];
-
cam_hdr *chdr = (void
*)obuf;
-
cam_hdr *rhdr = (void
*)ibuf;
+
struct cam_hdr *chdr = (void
*)obuf;
+
struct cam_hdr *rhdr = (void
*)ibuf;
if (cmd_len & 1 || cmd_len > (0x400 - sizeof(*chdr))) {
err("send_cmd: Invalid command length (0x%x)", cmd_len);
if (cmd_len & 1 || cmd_len > (0x400 - sizeof(*chdr))) {
err("send_cmd: Invalid command length (0x%x)", cmd_len);
@@
-151,7
+152,8
@@
static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf,
memcpy(obuf+sizeof(*chdr), cmdbuf, cmd_len);
res = kinect_write(udev, obuf, cmd_len + sizeof(*chdr));
memcpy(obuf+sizeof(*chdr), cmdbuf, cmd_len);
res = kinect_write(udev, obuf, cmd_len + sizeof(*chdr));
- PDEBUG(D_USBO, "Control cmd=%04x tag=%04x len=%04x: %d", cmd, sd->cam_tag, cmd_len, res);
+ PDEBUG(D_USBO, "Control cmd=%04x tag=%04x len=%04x: %d", cmd,
+ sd->cam_tag, cmd_len, res);
if (res < 0) {
err("send_cmd: Output control transfer failed (%d)", res);
return res;
if (res < 0) {
err("send_cmd: Output control transfer failed (%d)", res);
return res;
@@
-168,7
+170,8
@@
static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf,
actual_len -= sizeof(*rhdr);
if (rhdr->magic[0] != 0x52 || rhdr->magic[1] != 0x42) {
actual_len -= sizeof(*rhdr);
if (rhdr->magic[0] != 0x52 || rhdr->magic[1] != 0x42) {
- err("send_cmd: Bad magic %02x %02x", rhdr->magic[0], rhdr->magic[1]);
+ err("send_cmd: Bad magic %02x %02x", rhdr->magic[0],
+ rhdr->magic[1]);
return -1;
}
if (rhdr->cmd != chdr->cmd) {
return -1;
}
if (rhdr->cmd != chdr->cmd) {
@@
-198,7
+201,8
@@
static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf,
return actual_len;
}
return actual_len;
}
-static int write_register(struct gspca_dev *gspca_dev, uint16_t reg, uint16_t data)
+static int write_register(struct gspca_dev *gspca_dev, uint16_t reg,
+ uint16_t data)
{
uint16_t reply[2];
uint16_t cmd[2];
{
uint16_t reply[2];
uint16_t cmd[2];
@@
-335,7
+339,7
@@
static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *__data, int len)
{
struct sd *sd = (struct sd *) gspca_dev;
{
struct sd *sd = (struct sd *) gspca_dev;
- struct pkt_hdr *hdr = (void*)__data;
+ struct pkt_hdr *hdr = (void
*)__data;
uint8_t *data = __data + sizeof(*hdr);
int datalen = len - sizeof(*hdr);
uint8_t *data = __data + sizeof(*hdr);
int datalen = len - sizeof(*hdr);
@@
-358,7
+362,7
@@
static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *__data, int len)
else if (hdr->flag == mof)
gspca_frame_add(gspca_dev, INTER_PACKET, data, datalen);
else if (hdr->flag == mof)
gspca_frame_add(gspca_dev, INTER_PACKET, data, datalen);
- else if(hdr->flag == eof)
+ else if
(hdr->flag == eof)
gspca_frame_add(gspca_dev, LAST_PACKET, data, datalen);
else
gspca_frame_add(gspca_dev, LAST_PACKET, data, datalen);
else