diff --git a/packages/platforms/delta/x86-64/x86-64-delta-ag7648/onlp/builds/src/module/src/x86_64_delta_i2c.c b/packages/platforms/delta/x86-64/x86-64-delta-ag7648/onlp/builds/src/module/src/x86_64_delta_i2c.c index b86c39e4..12c9c9a4 100755 --- a/packages/platforms/delta/x86-64/x86-64-delta-ag7648/onlp/builds/src/module/src/x86_64_delta_i2c.c +++ b/packages/platforms/delta/x86-64/x86-64-delta-ag7648/onlp/builds/src/module/src/x86_64_delta_i2c.c @@ -113,25 +113,8 @@ struct i2c_device_info i2c_device_list[]={ {NULL, -1,-1}, }; -#define I2C_DATA_B 1 -#define I2C_DATA_W 2 -#define I2C_DATA_C 3 -#define I2C_DATA_QUICK 4 - uint32_t i2c_flag=ONLP_I2C_F_FORCE; -static pthread_mutex_t i2c_mutex = PTHREAD_MUTEX_INITIALIZER; - -void I2C_PROTECT (void) -{ - pthread_mutex_lock (&i2c_mutex); -} - -void I2C_UNPROTECT (void) -{ - pthread_mutex_unlock (&i2c_mutex); -} - i2c_device_info_t *i2c_dev_find_by_name (char *name) { i2c_device_info_t *i2c_dev = i2c_device_list; @@ -155,11 +138,9 @@ int i2c_devname_read_byte (char *name, int reg) if(i2c_dev==NULL) return -1; - I2C_PROTECT(); ret=onlp_i2c_readb(i2c_dev->i2cbus, i2c_dev->addr, reg, i2c_flag); - I2C_UNPROTECT(); return ret; } @@ -171,11 +152,9 @@ int i2c_devname_write_byte (char *name, int reg, int value) if(i2c_dev==NULL) return -1; - I2C_PROTECT(); ret=onlp_i2c_writeb (i2c_dev->i2cbus, i2c_dev->addr, reg, value, i2c_flag); - I2C_UNPROTECT(); return ret; } @@ -186,12 +165,9 @@ int i2c_devname_read_word (char *name, int reg) i2c_device_info_t *i2c_dev = i2c_dev_find_by_name (name); if(i2c_dev==NULL) return -1; - - I2C_PROTECT(); ret=onlp_i2c_readw(i2c_dev->i2cbus, i2c_dev->addr, reg, i2c_flag); - I2C_UNPROTECT(); return ret; } @@ -203,11 +179,9 @@ int i2c_devname_write_word (char *name, int reg, int value) if(i2c_dev==NULL) return -1; - I2C_PROTECT(); ret=onlp_i2c_writew (i2c_dev->i2cbus, i2c_dev->addr, reg, value, i2c_flag); - I2C_UNPROTECT(); return ret; } @@ -220,11 +194,9 @@ int i2c_devname_read_block (char *name, int reg, uint8_t*buff, int buff_size) if(i2c_dev==NULL) return -1; - I2C_PROTECT(); ret =onlp_i2c_block_read (i2c_dev->i2cbus, i2c_dev->addr, reg, buff_size, buff, i2c_flag); - I2C_UNPROTECT(); return ret; diff --git a/packages/platforms/delta/x86-64/x86-64-delta-ag7648/platform-config/r0/src/python/x86_64_delta_ag7648_r0/__init__.py b/packages/platforms/delta/x86-64/x86-64-delta-ag7648/platform-config/r0/src/python/x86_64_delta_ag7648_r0/__init__.py index faed8260..44197649 100644 --- a/packages/platforms/delta/x86-64/x86-64-delta-ag7648/platform-config/r0/src/python/x86_64_delta_ag7648_r0/__init__.py +++ b/packages/platforms/delta/x86-64/x86-64-delta-ag7648/platform-config/r0/src/python/x86_64_delta_ag7648_r0/__init__.py @@ -1,13 +1,11 @@ from onl.platform.base import * from onl.platform.delta import * -class OnlPlatform_x86_64_delta_ag7648_r0(OnlPlatformDelta): +class OnlPlatform_x86_64_delta_ag7648_r0(OnlPlatformDelta,OnlPlatformPortConfig_48x10_6x40): PLATFORM='x86-64-delta-ag7648-r0' MODEL="AG7648" SYS_OBJECT_ID=".7648.1" - PORT_COUNT=54 - PORT_CONFIG="48x10 + 6x40" def baseconfig(self): self.new_i2c_device('pca9547', 0x70, 1);