Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 65885
b: refs/heads/master
c: 5658538
h: refs/heads/master
i:
  65883: 6affb69
v: v3
  • Loading branch information
Mike Isely authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent a5c17ac commit af13f0b
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f66d4eac6be2428901ab6e0cbb6747d5b6794ef
refs/heads/master: 56585386e297c54a65feef55810c13b4313bdf1e
53 changes: 27 additions & 26 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,33 @@ extern int pvrusb2_debug;

/* These are listed in *rough* order of decreasing usefulness and
increasing noise level. */
#define PVR2_TRACE_INFO (1 << 0) // Normal messages
#define PVR2_TRACE_ERROR_LEGS (1 << 1) // error messages
#define PVR2_TRACE_TOLERANCE (1 << 2) // track tolerance-affected errors
#define PVR2_TRACE_TRAP (1 << 3) // Trap & report misbehavior from app
#define PVR2_TRACE_INIT (1 << 4) // misc initialization steps
#define PVR2_TRACE_START_STOP (1 << 5) // Streaming start / stop
#define PVR2_TRACE_CTL (1 << 6) // commit of control changes
#define PVR2_TRACE_DEBUG (1 << 7) // Temporary debug code
#define PVR2_TRACE_EEPROM (1 << 8) // eeprom parsing / report
#define PVR2_TRACE_STRUCT (1 << 9) // internal struct creation
#define PVR2_TRACE_OPEN_CLOSE (1 << 10) // application open / close
#define PVR2_TRACE_CREG (1 << 11) // Main critical region entry / exit
#define PVR2_TRACE_SYSFS (1 << 12) // Sysfs driven I/O
#define PVR2_TRACE_FIRMWARE (1 << 13) // firmware upload actions
#define PVR2_TRACE_CHIPS (1 << 14) // chip broadcast operation
#define PVR2_TRACE_I2C (1 << 15) // I2C related stuff
#define PVR2_TRACE_I2C_CMD (1 << 16) // Software commands to I2C modules
#define PVR2_TRACE_I2C_CORE (1 << 17) // I2C core debugging
#define PVR2_TRACE_I2C_TRAF (1 << 18) // I2C traffic through the adapter
#define PVR2_TRACE_V4LIOCTL (1 << 19) // v4l ioctl details
#define PVR2_TRACE_ENCODER (1 << 20) // mpeg2 encoder operation
#define PVR2_TRACE_BUF_POOL (1 << 21) // Track buffer pool management
#define PVR2_TRACE_BUF_FLOW (1 << 22) // Track buffer flow in system
#define PVR2_TRACE_DATA_FLOW (1 << 23) // Track data flow
#define PVR2_TRACE_DEBUGIFC (1 << 24) // Debug interface actions
#define PVR2_TRACE_GPIO (1 << 25) // GPIO state bit changes
#define PVR2_TRACE_INFO (1 << 0) /* Normal messages */
#define PVR2_TRACE_ERROR_LEGS (1 << 1) /* error messages */
#define PVR2_TRACE_TOLERANCE (1 << 2) /* track tolerance-affected errors */
#define PVR2_TRACE_TRAP (1 << 3) /* Trap & report app misbehavior */
#define PVR2_TRACE_STD (1 << 4) /* Log video standard stuff */
#define PVR2_TRACE_INIT (1 << 5) /* misc initialization steps */
#define PVR2_TRACE_START_STOP (1 << 6) /* Streaming start / stop */
#define PVR2_TRACE_CTL (1 << 7) /* commit of control changes */
#define PVR2_TRACE_DEBUG (1 << 8) /* Temporary debug code */
#define PVR2_TRACE_EEPROM (1 << 9) /* eeprom parsing / report */
#define PVR2_TRACE_STRUCT (1 << 10) /* internal struct creation */
#define PVR2_TRACE_OPEN_CLOSE (1 << 11) /* application open / close */
#define PVR2_TRACE_CREG (1 << 12) /* Main critical region entry / exit */
#define PVR2_TRACE_SYSFS (1 << 13) /* Sysfs driven I/O */
#define PVR2_TRACE_FIRMWARE (1 << 14) /* firmware upload actions */
#define PVR2_TRACE_CHIPS (1 << 15) /* chip broadcast operation */
#define PVR2_TRACE_I2C (1 << 16) /* I2C related stuff */
#define PVR2_TRACE_I2C_CMD (1 << 17) /* Software commands to I2C modules */
#define PVR2_TRACE_I2C_CORE (1 << 18) /* I2C core debugging */
#define PVR2_TRACE_I2C_TRAF (1 << 19) /* I2C traffic through the adapter */
#define PVR2_TRACE_V4LIOCTL (1 << 20) /* v4l ioctl details */
#define PVR2_TRACE_ENCODER (1 << 21) /* mpeg2 encoder operation */
#define PVR2_TRACE_BUF_POOL (1 << 22) /* Track buffer pool management */
#define PVR2_TRACE_BUF_FLOW (1 << 23) /* Track buffer flow in system */
#define PVR2_TRACE_DATA_FLOW (1 << 24) /* Track data flow */
#define PVR2_TRACE_DEBUGIFC (1 << 25) /* Debug interface actions */
#define PVR2_TRACE_GPIO (1 << 26) /* GPIO state bit changes */


#endif /* __PVRUSB2_HDW_INTERNAL_H */
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
std1 = get_default_standard(hdw);

bcnt = pvr2_std_id_to_str(buf,sizeof(buf),hdw->std_mask_eeprom);
pvr2_trace(PVR2_TRACE_INIT,
pvr2_trace(PVR2_TRACE_STD,
"Supported video standard(s) reported by eeprom: %.*s",
bcnt,buf);

Expand All @@ -1750,7 +1750,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
std2 = std1 & ~hdw->std_mask_avail;
if (std2) {
bcnt = pvr2_std_id_to_str(buf,sizeof(buf),std2);
pvr2_trace(PVR2_TRACE_INIT,
pvr2_trace(PVR2_TRACE_STD,
"Expanding supported video standards"
" to include: %.*s",
bcnt,buf);
Expand All @@ -1761,7 +1761,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)

if (std1) {
bcnt = pvr2_std_id_to_str(buf,sizeof(buf),std1);
pvr2_trace(PVR2_TRACE_INIT,
pvr2_trace(PVR2_TRACE_STD,
"Initial video standard forced to %.*s",
bcnt,buf);
hdw->std_mask_cur = std1;
Expand All @@ -1781,7 +1781,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
hdw->std_mask_eeprom)) continue;
bcnt = pvr2_std_id_to_str(buf,sizeof(buf),
std_eeprom_maps[idx].std);
pvr2_trace(PVR2_TRACE_INIT,
pvr2_trace(PVR2_TRACE_STD,
"Initial video standard guessed as %.*s",
bcnt,buf);
hdw->std_mask_cur = std_eeprom_maps[idx].std;
Expand All @@ -1796,7 +1796,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
hdw->std_enum_cur = 1;
hdw->std_mask_cur = hdw->std_defs[hdw->std_enum_cur-1].id;
hdw->std_dirty = !0;
pvr2_trace(PVR2_TRACE_INIT,
pvr2_trace(PVR2_TRACE_STD,
"Initial video standard auto-selected to %s",
hdw->std_defs[hdw->std_enum_cur-1].name);
return;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

#define DEFAULT_DEBUG_MASK (PVR2_TRACE_ERROR_LEGS| \
PVR2_TRACE_INFO| \
PVR2_TRACE_STD| \
PVR2_TRACE_TOLERANCE| \
PVR2_TRACE_TRAP| \
0)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ static int pvr2_std_fill(struct v4l2_standard *std,v4l2_std_id id)
std->id = id;
bcnt = pvr2_std_id_to_str(std->name,sizeof(std->name)-1,id);
std->name[bcnt] = 0;
pvr2_trace(PVR2_TRACE_INIT,"Set up standard idx=%u name=%s",
pvr2_trace(PVR2_TRACE_STD,"Set up standard idx=%u name=%s",
std->index,std->name);
return !0;
}
Expand All @@ -320,11 +320,11 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
v4l2_std_id idmsk,cmsk,fmsk;
struct v4l2_standard *stddefs;

if (pvrusb2_debug & PVR2_TRACE_INIT) {
if (pvrusb2_debug & PVR2_TRACE_STD) {
char buf[50];
bcnt = pvr2_std_id_to_str(buf,sizeof(buf),id);
pvr2_trace(
PVR2_TRACE_INIT,"Mapping standards mask=0x%x (%.*s)",
PVR2_TRACE_STD,"Mapping standards mask=0x%x (%.*s)",
(int)id,bcnt,buf);
}

Expand Down Expand Up @@ -355,7 +355,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
bcnt,buf);
}

pvr2_trace(PVR2_TRACE_INIT,"Setting up %u unique standard(s)",
pvr2_trace(PVR2_TRACE_STD,"Setting up %u unique standard(s)",
std_cnt);
if (!std_cnt) return NULL; // paranoia

Expand Down

0 comments on commit af13f0b

Please sign in to comment.