proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 10:44:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Use guint8 rather than guchar

Browse Source 
Although it's probably the same, this matches the other plugins.
This commit is contained in:
Richard Hughes 2017-01-17 14:10:12 +00:00
parent 26aade02d2
commit 2153cd0f89
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
plugins/synapticsmst/synapticsmst-common.c
View File

@ -36,11 +36,11 @@
#define MAX_WAIT_TIME 3 /* unit : second */ #define MAX_WAIT_TIME 3 /* unit : second */
gint g_fd = 0; gint g_fd = 0;
guchar g_layer = 0; guint8 g_layer = 0;
guchar g_remain_layer = 0; guint8 g_remain_layer = 0;
guchar g_rad = 0; guint8 g_rad = 0;
static guchar static guint8
synapticsmst_common_aux_node_read (gint offset, gint *buf, gint length) synapticsmst_common_aux_node_read (gint offset, gint *buf, gint length)
{ {
if (lseek (g_fd, offset, SEEK_SET) != offset) if (lseek (g_fd, offset, SEEK_SET) != offset)
@ -52,7 +52,7 @@ synapticsmst_common_aux_node_read (gint offset, gint *buf, gint length)
return DPCD_SUCCESS; return DPCD_SUCCESS;
} }
static guchar static guint8
synapticsmst_common_aux_node_write (gint offset, gint *buf, gint length) synapticsmst_common_aux_node_write (gint offset, gint *buf, gint length)
{ {
if (lseek (g_fd, offset, SEEK_SET) != offset) if (lseek (g_fd, offset, SEEK_SET) != offset)
@ -67,7 +67,7 @@ synapticsmst_common_aux_node_write (gint offset, gint *buf, gint length)
gint gint
synapticsmst_common_open_aux_node (const gchar* filename) synapticsmst_common_open_aux_node (const gchar* filename)
{ {
guchar byte[4]; guint8 byte[4];
g_fd = open (filename, O_RDWR); g_fd = open (filename, O_RDWR);
@ -94,37 +94,37 @@ synapticsmst_common_close_aux_node (void)
} }
void void
synapticsmst_common_config_connection (guchar layer, guint rad) synapticsmst_common_config_connection (guint8 layer, guint rad)
{ {
g_layer = layer; g_layer = layer;
g_remain_layer = g_layer; g_remain_layer = g_layer;
g_rad = rad; g_rad = rad;
} }
guchar guint8
synapticsmst_common_read_dpcd (gint offset, gint *buf, gint length) synapticsmst_common_read_dpcd (gint offset, gint *buf, gint length)
{ {
if (g_layer && g_remain_layer) { if (g_layer && g_remain_layer) {
guchar rc, node; guint8 rc, node;
g_remain_layer--; g_remain_layer--;
node = (g_rad >> g_remain_layer * 2) & 0x03; node = (g_rad >> g_remain_layer * 2) & 0x03;
rc = synapticsmst_common_rc_get_command (UPDC_READ_FROM_TX_DPCD + node, length, offset, (guchar *)buf); rc = synapticsmst_common_rc_get_command (UPDC_READ_FROM_TX_DPCD + node, length, offset, (guint8 *)buf);
g_remain_layer++; g_remain_layer++;
return rc; return rc;
} }
return synapticsmst_common_aux_node_read (offset, buf, length); return synapticsmst_common_aux_node_read (offset, buf, length);
} }
guchar guint8
synapticsmst_common_write_dpcd (gint offset, gint *buf, gint length) synapticsmst_common_write_dpcd (gint offset, gint *buf, gint length)
{ {
if (g_layer && g_remain_layer) { if (g_layer && g_remain_layer) {
guchar rc, node; guint8 rc, node;
g_remain_layer--; g_remain_layer--;
node = (g_rad >> g_remain_layer * 2) & 0x03; node = (g_rad >> g_remain_layer * 2) & 0x03;
rc = synapticsmst_common_rc_set_command (UPDC_WRITE_TO_TX_DPCD + node, length, offset, (guchar *)buf); rc = synapticsmst_common_rc_set_command (UPDC_WRITE_TO_TX_DPCD + node, length, offset, (guint8 *)buf);
g_remain_layer++; g_remain_layer++;
return rc; return rc;
} else { } else {
@ -132,10 +132,10 @@ synapticsmst_common_write_dpcd (gint offset, gint *buf, gint length)
} }
} }
guchar guint8
synapticsmst_common_rc_set_command (gint rc_cmd, gint length, gint offset, guchar *buf) synapticsmst_common_rc_set_command (gint rc_cmd, gint length, gint offset, guint8 *buf)
{ {
guchar rc = 0; guint8 rc = 0;
gint cur_offset = offset; gint cur_offset = offset;
gint cur_length; gint cur_length;
gint data_left = length; gint data_left = length;
@ -201,10 +201,10 @@ synapticsmst_common_rc_set_command (gint rc_cmd, gint length, gint offset, gucha
return rc; return rc;
} }
guchar guint8
synapticsmst_common_rc_get_command (gint rc_cmd, gint length, gint offset, guchar *buf) synapticsmst_common_rc_get_command (gint rc_cmd, gint length, gint offset, guint8 *buf)
{ {
guchar rc = 0; guint8 rc = 0;
gint cur_offset = offset; gint cur_offset = offset;
gint cur_length; gint cur_length;
gint data_need = length; gint data_need = length;
@ -272,15 +272,15 @@ synapticsmst_common_rc_get_command (gint rc_cmd, gint length, gint offset, gucha
return rc; return rc;
} }
guchar guint8
synapticsmst_common_rc_special_get_command (gint rc_cmd, synapticsmst_common_rc_special_get_command (gint rc_cmd,
gint cmd_length, gint cmd_length,
gint cmd_offset, gint cmd_offset,
guchar *cmd_data, guint8 *cmd_data,
gint length, gint length,
guchar *buf) guint8 *buf)
{ {
guchar rc = 0; guint8 rc = 0;
gint readData = 0; gint readData = 0;
gint cmd; gint cmd;
long deadline; long deadline;
@ -337,16 +337,16 @@ synapticsmst_common_rc_special_get_command (gint rc_cmd,
return rc; return rc;
} }
guchar guint8
synapticsmst_common_enable_remote_control (void) synapticsmst_common_enable_remote_control (void)
{ {
const gchar *sc = "PRIUS"; const gchar *sc = "PRIUS";
guchar tmp_layer = g_layer; guint8 tmp_layer = g_layer;
guchar rc = 0; guint8 rc = 0;
for (gint i = 0; i <= tmp_layer; i++) { for (gint i = 0; i <= tmp_layer; i++) {
synapticsmst_common_config_connection (i, g_rad); synapticsmst_common_config_connection (i, g_rad);
rc = synapticsmst_common_rc_set_command (UPDC_ENABLE_RC, 5, 0, (guchar*)sc); rc = synapticsmst_common_rc_set_command (UPDC_ENABLE_RC, 5, 0, (guint8*)sc);
if (rc) if (rc)
break; break;
} }
@ -355,15 +355,15 @@ synapticsmst_common_enable_remote_control (void)
return rc; return rc;
} }
guchar guint8
synapticsmst_common_disable_remote_control (void) synapticsmst_common_disable_remote_control (void)
{ {
guchar tmp_layer = g_layer; guint8 tmp_layer = g_layer;
guchar rc = 0; guint8 rc = 0;
for (gint i = tmp_layer; i >= 0; i--) { for (gint i = tmp_layer; i >= 0; i--) {
synapticsmst_common_config_connection (i, g_rad); synapticsmst_common_config_connection (i, g_rad);
rc = synapticsmst_common_rc_set_command (UPDC_DISABLE_RC, 0, 0, (guchar*)NULL); rc = synapticsmst_common_rc_set_command (UPDC_DISABLE_RC, 0, 0, (guint8*)NULL);
if (rc) if (rc)
break; break;
} }

24
plugins/synapticsmst/synapticsmst-common.h
View File

@ -75,36 +75,36 @@ gint synapticsmst_common_open_aux_node (const gchar *filename);
void synapticsmst_common_close_aux_node (void); void synapticsmst_common_close_aux_node (void);
void synapticsmst_common_config_connection (guchar layer, void synapticsmst_common_config_connection (guint8 layer,
guint rad); guint rad);
guchar synapticsmst_common_read_dpcd (gint offset, guint8 synapticsmst_common_read_dpcd (gint offset,
gint *buf, gint *buf,
gint length); gint length);
guchar synapticsmst_common_write_dpcd (gint offset, guint8 synapticsmst_common_write_dpcd (gint offset,
gint *buf, gint *buf,
gint length); gint length);
guchar synapticsmst_common_rc_set_command (gint rc_cmd, guint8 synapticsmst_common_rc_set_command (gint rc_cmd,
gint length, gint length,
gint offset, gint offset,
guchar *buf); guint8 *buf);
guchar synapticsmst_common_rc_get_command (gint rc_cmd, guint8 synapticsmst_common_rc_get_command (gint rc_cmd,
gint length, gint length,
gint offset, gint offset,
guchar *buf); guint8 *buf);
guchar synapticsmst_common_rc_special_get_command (gint rc_cmd, guint8 synapticsmst_common_rc_special_get_command (gint rc_cmd,
gint cmd_length, gint cmd_length,
gint cmd_offset, gint cmd_offset,
guchar *cmd_data, guint8 *cmd_data,
gint length, gint length,
guchar *buf); guint8 *buf);
guchar synapticsmst_common_enable_remote_control (void); guint8 synapticsmst_common_enable_remote_control (void);
guchar synapticsmst_common_disable_remote_control (void); guint8 synapticsmst_common_disable_remote_control (void);
#endif /* __SYNAPTICSMST_COMMON_H */ #endif /* __SYNAPTICSMST_COMMON_H */

2
plugins/synapticsmst/synapticsmst-device.c
View File

@ -324,7 +324,7 @@ synapticsmst_device_get_flash_checksum (SynapticsMSTDevice *device, gint length,
if (synapticsmst_common_rc_special_get_command (UPDC_CAL_EEPROM_CHECKSUM, if (synapticsmst_common_rc_special_get_command (UPDC_CAL_EEPROM_CHECKSUM,
length, offset, length, offset,
NULL, 4, NULL, 4,
(guchar *)checksum)) { (guint8 *)checksum)) {
g_set_error_literal (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_DATA, G_IO_ERROR_INVALID_DATA,