From: Hugo Villeneuve Date: Mon, 17 Nov 2025 15:46:42 +0000 (-0500) Subject: Remove support for EEPROM dev number X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=8ac85bd452d39ea37584d71f43dbe50b55709c46;p=mtlv.git Remove support for EEPROM dev number Signed-off-by: Hugo Villeneuve --- diff --git a/src/main.c b/src/main.c index c7de315..145ec8c 100644 --- a/src/main.c +++ b/src/main.c @@ -105,7 +105,7 @@ main(int argc, char **argv) if (options.tlv_cmd == TLV_CMD_INIT) { tlvinfo_default_tlv(eeprom); - rc = prog_eeprom(-1, eeprom); + rc = prog_eeprom(eeprom); if (rc) { log_err("Error writing TLV EEPROM\n"); exit(EXIT_FAILURE); @@ -115,7 +115,7 @@ main(int argc, char **argv) } /* Read all EEPROM content: */ - rc = read_eeprom(-1, eeprom); + rc = read_eeprom(eeprom); if (rc) { log_err("Error reading TLV EEPROM\n"); exit(EXIT_FAILURE); @@ -146,13 +146,13 @@ main(int argc, char **argv) if (options.tlv_key > 0) { (void) tlvinfo_show_tlv(eeprom, options.tlv_key); } else - show_eeprom(-1, eeprom); + show_eeprom(eeprom); } switch (options.tlv_cmd) { case TLV_CMD_ADD: case TLV_CMD_DEL: - rc = prog_eeprom(-1, eeprom); + rc = prog_eeprom(eeprom); if (rc < 0) { log_err("Error updating TLV infos\n"); exit(EXIT_FAILURE); diff --git a/src/tlv_eeprom.c b/src/tlv_eeprom.c index 133df10..683b7e3 100644 --- a/src/tlv_eeprom.c +++ b/src/tlv_eeprom.c @@ -147,18 +147,18 @@ void tlvinfo_default_tlv(u8 *eeprom) * * Read the EEPROM into memory, if it hasn't already been read. */ -int read_eeprom(int devnum, u8 *eeprom) +int read_eeprom(u8 *eeprom) { int ret; struct tlvinfo_header *eeprom_hdr = to_header(eeprom); struct tlvinfo_tlv *eeprom_tlv = to_entry(&eeprom[HDR_SIZE]); /* Read the header */ - ret = read_tlv_eeprom((void *)eeprom_hdr, 0, HDR_SIZE, devnum); + ret = read_tlv_eeprom((void *)eeprom_hdr, 0, HDR_SIZE); /* If the header was successfully read, read the TLVs */ if (ret == 0 && is_valid_tlvinfo_header(eeprom_hdr)) ret = read_tlv_eeprom((void *)eeprom_tlv, HDR_SIZE, - be16_to_cpu(eeprom_hdr->totallen), devnum); + be16_to_cpu(eeprom_hdr->totallen)); else if (ret == -ENODEV) return ret; @@ -170,7 +170,7 @@ int read_eeprom(int devnum, u8 *eeprom) * * Display the contents of the EEPROM */ -void show_eeprom(int devnum, u8 *eeprom) +void show_eeprom(u8 *eeprom) { int tlv_end; int curr_tlv; @@ -185,7 +185,6 @@ void show_eeprom(int devnum, u8 *eeprom) return; } - printf("TLV: %u\n", devnum); printf("TlvInfo Header:\n"); printf(" Id String: %s\n", eeprom_hdr->signature); printf(" Version: %d\n", eeprom_hdr->version); @@ -451,7 +450,7 @@ static void update_crc(u8 *eeprom) * * Write the EEPROM data from CPU memory to the hardware. */ -int prog_eeprom(int devnum, u8 *eeprom) +int prog_eeprom(u8 *eeprom) { int ret = 0; struct tlvinfo_header *eeprom_hdr = to_header(eeprom); @@ -460,7 +459,7 @@ int prog_eeprom(int devnum, u8 *eeprom) update_crc(eeprom); eeprom_len = HDR_SIZE + be16_to_cpu(eeprom_hdr->totallen); - ret = write_tlv_eeprom(eeprom, eeprom_len, devnum); + ret = write_tlv_eeprom(eeprom, eeprom_len); if (ret) { printf("Programming failed.\n"); return -1; @@ -886,30 +885,28 @@ static int set_bytes(char *buf, const char *string, int *converted_accum) /** * read_tlv_eeprom - read the hwinfo from i2c EEPROM */ -int read_tlv_eeprom(void *eeprom, int offset, int len, int dev_num) +int read_tlv_eeprom(void *eeprom, int offset, int len) { - (void) dev_num; return eeprom_block_read(offset, eeprom, len); } /** * write_tlv_eeprom - write the hwinfo to i2c EEPROM */ -int write_tlv_eeprom(void *eeprom, int len, int dev) +int write_tlv_eeprom(void *eeprom, int len) { - (void) dev; return eeprom_block_write(0, eeprom, len); } int read_tlvinfo_tlv_eeprom(void *eeprom, struct tlvinfo_header **hdr, - struct tlvinfo_tlv **first_entry, int dev_num) + struct tlvinfo_tlv **first_entry) { int ret; struct tlvinfo_header *tlv_hdr; struct tlvinfo_tlv *tlv_ent; /* Read TLV header */ - ret = read_tlv_eeprom(eeprom, 0, HDR_SIZE, dev_num); + ret = read_tlv_eeprom(eeprom, 0, HDR_SIZE); if (ret < 0) return ret; @@ -920,7 +917,7 @@ int read_tlvinfo_tlv_eeprom(void *eeprom, struct tlvinfo_header **hdr, /* Read TLV entries */ tlv_ent = to_entry(&tlv_hdr[1]); ret = read_tlv_eeprom(tlv_ent, HDR_SIZE, - be16_to_cpu(tlv_hdr->totallen), dev_num); + be16_to_cpu(tlv_hdr->totallen)); if (ret < 0) return ret; if (!is_checksum_valid(eeprom)) diff --git a/src/tlv_eeprom.h b/src/tlv_eeprom.h index 1ba49ae..88fd14c 100644 --- a/src/tlv_eeprom.h +++ b/src/tlv_eeprom.h @@ -80,7 +80,7 @@ struct __attribute__ ((__packed__)) tlvinfo_tlv { * */ -int read_tlv_eeprom(void *eeprom, int offset, int len, int dev); +int read_tlv_eeprom(void *eeprom, int offset, int len); /** * write_tlv_eeprom - Write the entire EEPROM binary data to the hardware @@ -91,7 +91,7 @@ int read_tlv_eeprom(void *eeprom, int offset, int len, int dev); * Note: this routine does not validate the EEPROM data. * */ -int write_tlv_eeprom(void *eeprom, int len, int dev); +int write_tlv_eeprom(void *eeprom, int len); /** * read_tlvinfo_tlv_eeprom - Read the TLV from EEPROM, and validate @@ -111,17 +111,17 @@ int write_tlv_eeprom(void *eeprom, int len, int dev); */ int read_tlvinfo_tlv_eeprom(void *eeprom, struct tlvinfo_header **hdr, - struct tlvinfo_tlv **first_entry, int dev); + struct tlvinfo_tlv **first_entry); void tlvinfo_default_tlv(u8 *eeprom); bool is_valid_tlvinfo(u8 *eeprom); -void show_eeprom(int devnum, u8 *eeprom); +void show_eeprom(u8 *eeprom); bool tlvinfo_find_tlv(u8 *eeprom, u8 tcode, int *eeprom_index); bool tlvinfo_delete_tlv(u8 *eeprom, u8 code); bool tlvinfo_add_tlv(u8 *eeprom, int tcode, char *strval); bool tlvinfo_show_tlv(u8 *eeprom, u8 tcode); -int prog_eeprom(int devnum, u8 *eeprom); -int read_eeprom(int devnum, u8 *eeprom); +int prog_eeprom(u8 *eeprom); +int read_eeprom(u8 *eeprom); void show_tlv_code_list(void); /* Callbacks in main.c */