Skip to content

S
Software for White Rabbit PTP Core
Commit 2ce362cb authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

code optimization: use int instead of uint8_t 

This saves 36B.
Note: not all changes result in a code size change
Signed-off-by: 's avatarAdam Wujek <adam.wujek@creotech.pl>
parent 10a30d28
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 53 deletions
dev/bb_i2c.c
View file @ 2ce362cb
......@@ -48,7 +48,7 @@ void bb_i2c_stop(struct i2c_bus *bus)
unsigned char bb_i2c_put_byte(struct i2c_bus *bus, uint8_t data)
{
int i;
uint8_t ack;
int ack;
for (i = 0; i < 8; i++, data <<= 1) {
M_SDA_OUT(data & 0x80);
......@@ -66,7 +66,7 @@ unsigned char bb_i2c_put_byte(struct i2c_bus *bus, uint8_t data)
return ack != 0;
}
void bb_i2c_get_byte(struct i2c_bus *bus, uint8_t *data, uint8_t last)
void bb_i2c_get_byte(struct i2c_bus *bus, uint8_t *data, int last)
{
int i;
......@@ -113,9 +113,9 @@ void bb_i2c_init(struct i2c_bus *bus)
M_SDA_OUT(1);
}
uint8_t bb_i2c_devprobe(struct i2c_bus *bus, uint8_t i2c_addr)
int bb_i2c_devprobe(struct i2c_bus *bus, uint8_t i2c_addr)
{
uint8_t ret;
int ret;
bb_i2c_start(bus);
ret = !bb_i2c_put_byte(bus, i2c_addr << 1);
bb_i2c_stop(bus);
......
dev/eeprom.c
View file @ 2ce362cb
......@@ -61,7 +61,7 @@
static uint8_t sfpcount = SFP_DB_EMPTY;
uint8_t has_eeprom = 0;
static int has_eeprom = 0;
static int i2cif, i2c_addr; /* globals, using the names we always used */
......@@ -164,7 +164,7 @@ static uint8_t sfp_chksum(uint8_t *ptr)
int storage_get_sfp(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
{
uint8_t i;
int i;
struct s_sfpinfo dbsfp;
if (pos >= SFPS_MAX) {
......@@ -302,7 +302,7 @@ int storage_init_erase(void)
*/
int storage_init_add(const char *args[])
{
uint8_t i = 1;
int i = 1;
uint8_t separator = ' ';
uint16_t used, readback;
......@@ -371,7 +371,7 @@ int storage_init_readcmd(uint8_t *buf, uint8_t bufsize, uint8_t next)
{
static uint16_t ptr;
static uint16_t used = 0;
uint8_t i = 0;
int i = 0;
if (next == 0) {
if (eeprom_read(i2cif, i2c_addr, EE_BASE_INIT,
......
dev/minic.c
View file @ 2ce362cb
......@@ -50,19 +50,19 @@ static inline uint32_t minic_readl(uint32_t reg)
return *(volatile uint32_t *)(BASE_MINIC + reg);
}
static inline void minic_txword(uint8_t type, uint16_t word)
static inline void minic_txword(int type, uint16_t word)
{
minic_writel(MINIC_REG_TX_FIFO,
MINIC_TX_FIFO_TYPE_W(type) | MINIC_TX_FIFO_DAT_W(word));
}
static inline void minic_rxword(uint8_t *type, uint16_t *data, uint8_t *empty,
uint8_t *full)
static inline void minic_rxword(int *type, uint16_t *data, int *empty,
int *full)
{
uint32_t rx;
rx = minic_readl(MINIC_REG_RX_FIFO);
*type = (uint8_t) MINIC_RX_FIFO_TYPE_R(rx);
*type = MINIC_RX_FIFO_TYPE_R(rx);
*data = (uint16_t) MINIC_RX_FIFO_DAT_R(rx);
if (empty)
*empty = (rx & MINIC_RX_FIFO_EMPTY) ? 1 : 0;
......@@ -114,7 +114,7 @@ int minic_rx_frame(struct wr_ethhdr *hdr, uint8_t * payload, uint32_t buf_size,
{
uint32_t hdr_size, payload_size;
uint32_t raw_ts;
uint8_t rx_empty, rx_full, rx_type;
int rx_empty, rx_full, rx_type;
uint16_t rx_data;
uint16_t *ptr16_hdr, *ptr16_payload;
uint32_t oob_cnt;
......@@ -224,7 +224,7 @@ int minic_tx_frame(struct wr_ethhdr_vlan *hdr, uint8_t *payload, uint32_t size,
struct hw_timestamp *hwts)
{
uint32_t d_hdr, mcr, pwords, hwords;
uint8_t ts_valid;
int ts_valid;
int i, hsize;
uint16_t *ptr;
......@@ -307,8 +307,8 @@ int minic_tx_frame(struct wr_ethhdr_vlan *hdr, uint8_t *payload, uint32_t size,
if(ts_valid)
ts_valid = (uint8_t)(minic_readl(MINIC_REG_TSR0)
& MINIC_TSR0_VALID);
ts_valid = minic_readl(MINIC_REG_TSR0)
& MINIC_TSR0_VALID;
raw_ts = minic_readl(MINIC_REG_TSR1);
fid = MINIC_TSR0_FID_R(minic_readl(MINIC_REG_TSR0));
......
dev/storage.c
View file @ 2ce362cb
......@@ -496,12 +496,13 @@ static int sfp_valid(struct s_sfpinfo *sfp)
return 1;
}
static int sfp_entry(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
static int sfp_entry(struct s_sfpinfo *sfp, int oper, int pos)
{
static uint8_t sfpcount = 0;
static int sfpcount = 0;
struct s_sfpinfo tempsfp;
int ret = -1;
uint8_t i, chksum = 0;
int i;
int chksum = 0;
uint8_t *ptr;
int sdb_offset;
......@@ -515,13 +516,13 @@ static int sfp_entry(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
* call */
if (!pos) {
sfpcount = 0;
sdb_offset = sizeof(sfpcount);
sdb_offset = 1; /* sfpcount */
while (sdbfs_fread(&wrc_sdbfs, sdb_offset, &tempsfp,
sizeof(tempsfp)) == sizeof(tempsfp)) {
if (!sfp_valid(&tempsfp))
break;
sfpcount++;
sdb_offset = sizeof(sfpcount) + sfpcount * sizeof(tempsfp);
sdb_offset = 1 /* sfpcount */ + sfpcount * sizeof(tempsfp);
}
}
......@@ -538,7 +539,7 @@ static int sfp_entry(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
}
if (oper == SFP_GET) {
sdb_offset = sizeof(sfpcount) + pos * sizeof(*sfp);
sdb_offset = 1 /* sfpcount */ + pos * sizeof(*sfp);
if (sdbfs_fread(&wrc_sdbfs, sdb_offset, sfp, sizeof(*sfp))
!= sizeof(*sfp))
goto out;
......@@ -547,7 +548,7 @@ static int sfp_entry(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
/* read sizeof() - 1 because we don't include checksum */
for (i = 0; i < sizeof(struct s_sfpinfo) - 1; ++i)
chksum = chksum + *(ptr++);
if (chksum != sfp->chksum) {
if ((chksum & 0xff) != sfp->chksum) {
pp_printf("sfp: corrupted checksum\n");
goto out;
}
......@@ -560,7 +561,7 @@ static int sfp_entry(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
chksum = chksum + *(ptr++);
sfp->chksum = chksum;
/* add SFP at the end of DB */
sdb_offset = sizeof(sfpcount) + sfpcount * sizeof(*sfp);
sdb_offset = 1 /* sfpcount */ + sfpcount * sizeof(*sfp);
if (sdbfs_fwrite(&wrc_sdbfs, sdb_offset, sfp, sizeof(*sfp))
!= sizeof(*sfp)) {
goto out;
......@@ -577,7 +578,7 @@ static int storage_update_sfp(struct s_sfpinfo *sfp)
{
int sfpcount = 1;
int temp;
int8_t i;
int i;
struct s_sfpinfo sfp_db[SFPS_MAX];
struct s_sfpinfo *dbsfp;
......@@ -613,7 +614,7 @@ static int storage_update_sfp(struct s_sfpinfo *sfp)
return i;
}
int storage_get_sfp(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
int storage_get_sfp(struct s_sfpinfo *sfp, int oper, int pos)
{
struct s_sfpinfo tmp_sfp;
......@@ -636,8 +637,8 @@ int storage_get_sfp(struct s_sfpinfo *sfp, uint8_t oper, uint8_t pos)
int storage_match_sfp(struct s_sfpinfo *sfp)
{
uint8_t sfpcount = 1;
int8_t i;
int sfpcount = 1;
int i;
struct s_sfpinfo dbsfp;
for (i = 0; i < sfpcount; ++i) {
......@@ -823,7 +824,7 @@ out_close:
}
// FIXME: migrate to new API
int storage_phtrans(uint32_t *valp, uint8_t write)
int storage_phtrans(uint32_t *valp, int write)
{
if( !write )
return storage_get_calibration_parameter( CAL_PARAM_T24P, valp );
......@@ -834,7 +835,7 @@ int storage_phtrans(uint32_t *valp, uint8_t write)
/* MAC Address Storage */
int storage_get_persistent_mac(uint8_t portnum, uint8_t *mac)
int storage_get_persistent_mac(int portnum, uint8_t *mac)
{
int ret = 0;
//int i;
......@@ -891,7 +892,7 @@ int storage_get_persistent_mac(uint8_t portnum, uint8_t *mac)
return 0;
}
int storage_set_persistent_mac(uint8_t portnum, uint8_t *mac)
int storage_set_persistent_mac(int portnum, uint8_t *mac)
{
int ret;
......@@ -1020,7 +1021,7 @@ out:
return ret;
}
int storage_init_readcmd(uint8_t *buf, uint8_t bufsize, uint8_t next)
int storage_init_readcmd(uint8_t *buf, int bufsize, int next)
{
int i = 0, ret = -1;
uint16_t used;
......
dev/syscon.c
View file @ 2ce362cb
......@@ -215,7 +215,7 @@ int wdiag_get_snapshot(void)
return 0;
}
void wdiags_write_servo_state(int wr_mode, uint8_t servostate, uint64_t mu,
void wdiags_write_servo_state(int wr_mode, int servostate, uint64_t mu,
uint64_t dms, int32_t asym, int32_t cko,
int32_t setp, int32_t ucnt)
{
......@@ -240,7 +240,7 @@ void wdiags_write_port_state(int link, int locked)
syscon->WDIAG_PSTAT = val;
}
void wdiags_write_ptp_state(uint8_t ptpstate)
void wdiags_write_ptp_state(int ptpstate)
{
syscon->WDIAG_PTPSTAT = SYSC_WDIAG_PTPSTAT_PTPSTATE_W(ptpstate);
}
......
include/dev/bb_i2c.h
View file @ 2ce362cb
......@@ -15,13 +15,13 @@ struct i2c_bus
int loop_delay;
};
uint8_t bb_i2c_devprobe(struct i2c_bus *bus, uint8_t i2c_addr);
int bb_i2c_devprobe(struct i2c_bus *bus, uint8_t i2c_addr);
void bb_i2c_create(struct i2c_bus *bus, const struct gpio_pin *pin_scl, const struct gpio_pin *pin_sda );
void bb_i2c_init(struct i2c_bus *bus);
void bb_i2c_start(struct i2c_bus *bus);
void bb_i2c_repeat_start(struct i2c_bus *bus);
void bb_i2c_stop(struct i2c_bus *bus);
void bb_i2c_get_byte(struct i2c_bus *bus, uint8_t *data, uint8_t last);
void bb_i2c_get_byte(struct i2c_bus *bus, uint8_t *data, int last);
uint8_t bb_i2c_put_byte(struct i2c_bus *bus, uint8_t data);
void bb_i2c_delay(uint32_t delay);
void bb_i2c_scan(struct i2c_bus *bus);
......
include/dev/syscon.h
View file @ 2ce362cb
......@@ -131,11 +131,11 @@ void net_rst(void);
int wdiag_set_valid(int enable);
int wdiag_get_valid(void);
int wdiag_get_snapshot(void);
void wdiags_write_servo_state(int wr_mode, uint8_t servostate, uint64_t mu,
void wdiags_write_servo_state(int wr_mode, int servostate, uint64_t mu,
uint64_t dms, int32_t asym, int32_t cko,
int32_t setp, int32_t ucnt);
void wdiags_write_port_state(int link, int locked);
void wdiags_write_ptp_state(uint8_t ptpstate);
void wdiags_write_ptp_state(int ptpstate);
void wdiags_write_aux_state(uint32_t aux_states);
void wdiags_write_cnts(uint32_t tx, uint32_t rx);
void wdiags_write_time(uint64_t sec, uint32_t nsec);
......
include/storage.h
View file @ 2ce362cb
......@@ -123,14 +123,14 @@ void storage_init( struct i2c_bus *bus, int i2c_addr);
int storage_sfpdb_erase(void);
int storage_match_sfp(struct s_sfpinfo *sfp);
int storage_get_sfp(struct s_sfpinfo *sfp, uint8_t add, uint8_t pos);
int storage_get_sfp(struct s_sfpinfo *sfp, int add, int pos);
int storage_phtrans(uint32_t *val, uint8_t write);
int storage_phtrans(uint32_t *val, int write);
int storage_init_erase(void);
int storage_init_add(const char *args[]);
int storage_init_show(void);
int storage_init_readcmd(uint8_t *buf, uint8_t bufsize, uint8_t next);
int storage_init_readcmd(uint8_t *buf, int bufsize, int next);
int storage_sdbfs_erase( struct storage_device *dev, uint32_t addr, int force_base );
int storage_sdbfs_format( struct storage_device *dev, uint32_t addr, int force_base );
void storage_sdbfs_list(void);
......@@ -143,8 +143,8 @@ int storage_save_calibration(void);
int storage_read_hdl_cfg(void);
int storage_mount( struct storage_device *dev );
int storage_get_persistent_mac(uint8_t portnum, uint8_t *mac);
int storage_set_persistent_mac(uint8_t portnum, uint8_t *mac);
int storage_get_persistent_mac(int portnum, uint8_t *mac);
int storage_set_persistent_mac(int portnum, uint8_t *mac);
#endif
lib/event.c
View file @ 2ce362cb
......@@ -31,7 +31,7 @@ struct event_handler
static struct event_handler handlers[MAX_EVENT_HANDLERS];
static int event_handler_count = 0;
static inline void queue_put( struct event_queue* buf, uint8_t c )
static inline void queue_put( struct event_queue* buf, int c )
{
if (buf->count >= buf->size)
return;
......
lib/lldp.c
View file @ 2ce362cb
......@@ -36,14 +36,14 @@ static struct wr_sockaddr addr;
extern char wrc_hw_name[HW_NAME_LENGTH];
static void lldp_header_tlv(uint8_t tlv_type, uint8_t tlv_len)
static void lldp_header_tlv(int tlv_type, int tlv_len)
{
lldpdu[lldpdu_len] = tlv_type << 1;
lldpdu[lldpdu_len + LLDP_SUBTYPE] = tlv_len;
lldpdu_len += LLDP_HEADER;
}
static void fill_mac(uint8_t *tlv, uint8_t type)
static void fill_mac(uint8_t *tlv, int type)
{
*tlv = type;
/* write MAC after subtype byte */
......
lib/net.c
View file @ 2ce362cb
......@@ -225,7 +225,7 @@ int ptpd_netif_recvfrom(struct wrpc_socket *s, struct wr_sockaddr *from, void *d
uint16_t size;
struct wr_ethhdr hdr;
struct hw_timestamp hwts;
uint8_t spll_busy;
int spll_busy;
/*check if there is something to fetch */
if (!q->n)
......@@ -246,7 +246,7 @@ int ptpd_netif_recvfrom(struct wrpc_socket *s, struct wr_sockaddr *from, void *d
if (rx_timestamp) {
rx_timestamp->raw_nsec = hwts.nsec;
rx_timestamp->raw_ahead = hwts.ahead;
spll_busy = (uint8_t) spll_shifter_busy(0);
spll_busy = spll_shifter_busy(0);
spll_read_ptracker(0, &rx_timestamp->raw_phase, NULL);
rx_timestamp->sec = hwts.sec;
......
monitor/monitor_ppsi.c
View file @ 2ce362cb
......@@ -464,7 +464,7 @@ void print_main_data(void)
for (i = 0 ; i < ndevs; i++) {
struct wrc_netif_device *ndev = netif_get_device(i);
uint8_t port_up = ndev->link_state == NETIF_LINK_UP;
int port_up = ndev->link_state == NETIF_LINK_UP;
if (port_up) {
pcprintf(9, 1, C_GREEN, " %s: ", ndev->name);
......@@ -510,8 +510,8 @@ void print_main_data(void)
for (i = 0 ; i < ndevs; i++) {
struct wrc_netif_device *ndev = netif_get_device(i);
uint8_t port_up = ndev->link_state == NETIF_LINK_UP;
uint8_t color;
int port_up = ndev->link_state == NETIF_LINK_UP;
int color;
if (port_up) {
pcprintf(14, 1, C_GREEN, " %s: ", ndev->name);
......
shell/shell.c
View file @ 2ce362cb
......@@ -296,7 +296,7 @@ static int build_init_readcmd(uint8_t *cmd, int maxlen)
void shell_boot_script(void)
{
uint8_t next = 0;
int next = 0;
while (CONFIG_HAS_BUILD_INIT) {
cmd_len = build_init_readcmd((uint8_t *)cmd_buf,
......@@ -327,7 +327,7 @@ void shell_boot_script(void)
void shell_show_build_init(void)
{
uint8_t i = 0;
int i = 0;
pp_printf("-- built-in script --\n");
while (CONFIG_HAS_BUILD_INIT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment