diff options
| author | Mike Isely <isely@pobox.com> | 2007-01-28 12:33:29 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2007-01-28 12:33:29 -0600 |
| commit | a2f1e676e65632ce59bbaf4de91370af3ad4cc48 (patch) | |
| tree | 21b0d907f55947d6f0beac4c51304cecb8103ba1 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |
| parent | fc9fbf0841017b835acd49e045bef72fea3c26ce (diff) | |
| parent | 3d22ccad1a2aa5805380d65da1c56b9bf8286f6a (diff) | |
| download | mediapointer-dvb-s2-a2f1e676e65632ce59bbaf4de91370af3ad4cc48.tar.gz mediapointer-dvb-s2-a2f1e676e65632ce59bbaf4de91370af3ad4cc48.tar.bz2 | |
Merge from v4l-dvb
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index 4a4f1d64b..05c39d25f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c @@ -23,6 +23,7 @@ #include "pvrusb2-i2c-core.h" #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" +#include "pvrusb2-fx2-cmd.h" #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) @@ -70,7 +71,7 @@ static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */ memset(hdw->cmd_buffer, 0, sizeof(hdw->cmd_buffer)); /* Set up command buffer for an I2C write */ - hdw->cmd_buffer[0] = 0x08; /* write prefix */ + hdw->cmd_buffer[0] = FX2CMD_I2C_WRITE; /* write prefix */ hdw->cmd_buffer[1] = i2c_addr; /* i2c addr of chip */ hdw->cmd_buffer[2] = length; /* length of what follows */ if (length) memcpy(hdw->cmd_buffer + 3, data, length); @@ -139,7 +140,7 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */ memset(hdw->cmd_buffer, 0, sizeof(hdw->cmd_buffer)); /* Set up command buffer for an I2C write followed by a read */ - hdw->cmd_buffer[0] = 0x09; /* read prefix */ + hdw->cmd_buffer[0] = FX2CMD_I2C_READ; /* read prefix */ hdw->cmd_buffer[1] = dlen; /* arg length */ hdw->cmd_buffer[2] = rlen; /* answer length. Device will send one more byte (status). */ @@ -296,7 +297,7 @@ static int i2c_24xxx_ir(struct pvr2_hdw *hdw, /* Issue a command to the FX2 to read the IR receiver. */ LOCK_TAKE(hdw->ctl_lock); do { - hdw->cmd_buffer[0] = 0xec; + hdw->cmd_buffer[0] = FX2CMD_GET_IR_CODE; stat = pvr2_send_request(hdw, hdw->cmd_buffer,1, hdw->cmd_buffer,4); |