Remove w83795 and eeprom modules, Modify platform name in config file

This commit is contained in:
joy.yw.chang
2017-09-19 22:38:28 -07:00
parent b4158e5ebf
commit cbec057007
13 changed files with 112 additions and 2644 deletions

View File

@@ -1203,7 +1203,7 @@ CONFIG_EDA_DEF_ALIGN=0x00100000
#
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
# CONFIG_EEPROM_LEGACY is not set
CONFIG_EEPROM_LEGACY=m
# CONFIG_EEPROM_MAX6875 is not set
CONFIG_EEPROM_93CX6=y
# CONFIG_EEPROM_93XX46 is not set
@@ -2208,7 +2208,8 @@ CONFIG_SENSORS_W83781D=y
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83795 is not set
CONFIG_SENSORS_W83795=m
CONFIG_SENSORS_W83795_FANCTRL=y
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set

View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-config-vendor.yml VENDOR=ingrasys Vendor=ingrasys
!include $ONL_TEMPLATES/platform-config-vendor.yml VENDOR=ingrasys Vendor=Ingrasys

View File

@@ -2,6 +2,6 @@
from onl.platform.base import *
class OnlPlatformingrasys(OnlPlatformBase):
class OnlPlatformIngrasys(OnlPlatformBase):
MANUFACTURER='Ingrasys'
PRIVATE_ENTERPRISE_NUMBER=2468

View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml ARCH=amd64 VENDOR=ingrasys BASENAME=x86-64-ingrasys-s9100 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/no-platform-modules.yml ARCH=amd64 VENDOR=ingrasys BASENAME=x86-64-ingrasys-s9100 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"

View File

@@ -1,6 +0,0 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := ingrasys
BASENAME := x86-64-ingrasys-s9100
ARCH := x86_64
include $(ONL)/make/kmodule.mk

View File

@@ -1,237 +0,0 @@
/*
* Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
* Philip Edelbrock <phil@netroedge.com>
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2003 IBM Corp.
* Copyright (C) 2004 Jean Delvare <jdelvare@suse.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/mutex.h>
/* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
0x55, 0x56, 0x57, I2C_CLIENT_END };
/* Size of EEPROM in bytes */
#define EEPROM_SIZE 256
/* possible types of eeprom devices */
enum eeprom_nature {
UNKNOWN,
VAIO,
};
/* Each client has this additional data */
struct eeprom_data {
struct mutex update_lock;
u8 valid; /* bitfield, bit!=0 if slice is valid */
unsigned long last_updated[8]; /* In jiffies, 8 slices */
u8 data[EEPROM_SIZE]; /* Register values */
enum eeprom_nature nature;
};
static void eeprom_update_client(struct i2c_client *client, u8 slice)
{
struct eeprom_data *data = i2c_get_clientdata(client);
int i;
mutex_lock(&data->update_lock);
if (!(data->valid & (1 << slice)) ||
time_after(jiffies, data->last_updated[slice] + 300 * HZ)) {
dev_dbg(&client->dev, "Starting eeprom update, slice %u\n", slice);
if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
for (i = slice << 5; i < (slice + 1) << 5; i += 32)
if (i2c_smbus_read_i2c_block_data(client, i,
32, data->data + i)
!= 32)
goto exit;
} else {
for (i = slice << 5; i < (slice + 1) << 5; i += 2) {
int word = i2c_smbus_read_word_data(client, i);
if (word < 0)
goto exit;
data->data[i] = word & 0xff;
data->data[i + 1] = word >> 8;
}
}
data->last_updated[slice] = jiffies;
data->valid |= (1 << slice);
}
exit:
mutex_unlock(&data->update_lock);
}
static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
struct eeprom_data *data = i2c_get_clientdata(client);
u8 slice;
if (off > EEPROM_SIZE)
return 0;
if (off + count > EEPROM_SIZE)
count = EEPROM_SIZE - off;
/* Only refresh slices which contain requested bytes */
for (slice = off >> 5; slice <= (off + count - 1) >> 5; slice++)
eeprom_update_client(client, slice);
/* Hide Vaio private settings to regular users:
- BIOS passwords: bytes 0x00 to 0x0f
- UUID: bytes 0x10 to 0x1f
- Serial number: 0xc0 to 0xdf */
if (data->nature == VAIO && !capable(CAP_SYS_ADMIN)) {
int i;
for (i = 0; i < count; i++) {
if ((off + i <= 0x1f) ||
(off + i >= 0xc0 && off + i <= 0xdf))
buf[i] = 0;
else
buf[i] = data->data[off + i];
}
} else {
memcpy(buf, &data->data[off], count);
}
return count;
}
static struct bin_attribute eeprom_attr = {
.attr = {
.name = "eeprom",
.mode = S_IRUGO,
},
.size = EEPROM_SIZE,
.read = eeprom_read,
};
/* Return 0 if detection is successful, -ENODEV otherwise */
static int eeprom_detect(struct i2c_client *client, struct i2c_board_info *info)
{
struct i2c_adapter *adapter = client->adapter;
/* EDID EEPROMs are often 24C00 EEPROMs, which answer to all
addresses 0x50-0x57, but we only care about 0x50. So decline
attaching to addresses >= 0x51 on DDC buses */
if (!(adapter->class & I2C_CLASS_SPD) && client->addr >= 0x51)
return -ENODEV;
/* There are four ways we can read the EEPROM data:
(1) I2C block reads (faster, but unsupported by most adapters)
(2) Word reads (128% overhead)
(3) Consecutive byte reads (88% overhead, unsafe)
(4) Regular byte data reads (265% overhead)
The third and fourth methods are not implemented by this driver
because all known adapters support one of the first two. */
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_WORD_DATA)
&& !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK))
return -ENODEV;
strlcpy(info->type, "eeprom", I2C_NAME_SIZE);
return 0;
}
static int eeprom_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adapter = client->adapter;
struct eeprom_data *data;
int err;
if (!(data = kzalloc(sizeof(struct eeprom_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit;
}
memset(data->data, 0xff, EEPROM_SIZE);
i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
data->nature = UNKNOWN;
/* Detect the Vaio nature of EEPROMs.
We use the "PCG-" or "VGN-" prefix as the signature. */
if (client->addr == 0x57
&& i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
char name[4];
name[0] = i2c_smbus_read_byte_data(client, 0x80);
name[1] = i2c_smbus_read_byte_data(client, 0x81);
name[2] = i2c_smbus_read_byte_data(client, 0x82);
name[3] = i2c_smbus_read_byte_data(client, 0x83);
if (!memcmp(name, "PCG-", 4) || !memcmp(name, "VGN-", 4)) {
dev_info(&client->dev, "Vaio EEPROM detected, "
"enabling privacy protection\n");
data->nature = VAIO;
}
}
/* create the sysfs eeprom file */
err = sysfs_create_bin_file(&client->dev.kobj, &eeprom_attr);
if (err)
goto exit_kfree;
return 0;
exit_kfree:
kfree(data);
exit:
return err;
}
static int eeprom_remove(struct i2c_client *client)
{
sysfs_remove_bin_file(&client->dev.kobj, &eeprom_attr);
kfree(i2c_get_clientdata(client));
return 0;
}
static const struct i2c_device_id eeprom_id[] = {
{ "eeprom", 0 },
{ }
};
static struct i2c_driver eeprom_driver = {
.driver = {
.name = "eeprom",
},
.probe = eeprom_probe,
.remove = eeprom_remove,
.id_table = eeprom_id,
.class = I2C_CLASS_DDC | I2C_CLASS_SPD,
.detect = eeprom_detect,
.address_list = normal_i2c,
};
module_i2c_driver(eeprom_driver);
MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
"Philip Edelbrock <phil@netroedge.com> and "
"Greg Kroah-Hartman <greg@kroah.com>");
MODULE_DESCRIPTION("I2C EEPROM driver");
MODULE_LICENSE("GPL");

View File

@@ -32,96 +32,96 @@
* @{
*
*****************************************************************************/
#ifndef __INGRAYSYS_S9100_CONFIG_H__
#define __INGRAYSYS_S9100_CONFIG_H__
#ifndef __X86_64_INGRAYSYS_S9100_CONFIG_H__
#define __X86_64_INGRAYSYS_S9100_CONFIG_H__
#ifdef GLOBAL_INCLUDE_CUSTOM_CONFIG
#include <global_custom_config.h>
#endif
#ifdef INGRAYSYS_S9100_INCLUDE_CUSTOM_CONFIG
#ifdef X86_64_INGRAYSYS_S9100_INCLUDE_CUSTOM_CONFIG
#include <x86_64_ingrasys_s9100_custom_config.h>
#endif
/* <auto.start.cdefs(INGRAYSYS_S9100_CONFIG_HEADER).header> */
/* <auto.start.cdefs(X86_64_INGRAYSYS_S9100_CONFIG_HEADER).header> */
#include <AIM/aim.h>
/**
* INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
* X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
*
* Include or exclude logging. */
#ifndef INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
#define INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING 1
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
#define X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING 1
#endif
/**
* INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
* X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
*
* Default enabled log options. */
#ifndef INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
#define INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
#define X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT
#endif
/**
* INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
* X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
*
* Default enabled log bits. */
#ifndef INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
#define INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
#define X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT
#endif
/**
* INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
* X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
*
* Default enabled custom log bits. */
#ifndef INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
#define INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
#define X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0
#endif
/**
* INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
* X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
*
* Default all porting macros to use the C standard libraries. */
#ifndef INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
#define INGRAYSYS_S9100_CONFIG_PORTING_STDLIB 1
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
#define X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB 1
#endif
/**
* INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
* X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
*
* Include standard library headers for stdlib porting macros. */
#ifndef INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
#define INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
#define X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
#endif
/**
* INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
* X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
*
* Include generic uCli support. */
#ifndef INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
#define INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI 0
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
#define X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI 0
#endif
/**
* INGRAYSYS_S9100_CONFIG_SFP_COUNT
* X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT
*
* SFP Count. */
#ifndef INGRAYSYS_S9100_CONFIG_SFP_COUNT
#define INGRAYSYS_S9100_CONFIG_SFP_COUNT 0
#ifndef X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT
#define X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT 0
#endif
@@ -154,9 +154,9 @@ const char* x86_64_ingrasys_s9100_config_lookup(const char* setting);
*/
int x86_64_ingrasys_s9100_config_show(struct aim_pvs_s* pvs);
/* <auto.end.cdefs(INGRAYSYS_S9100_CONFIG_HEADER).header> */
/* <auto.end.cdefs(X86_64_INGRAYSYS_S9100_CONFIG_HEADER).header> */
#include "x86_64_ingrasys_s9100_porting.h"
#endif /* __INGRAYSYS_S9100_CONFIG_H__ */
#endif /* __X86_64_INGRAYSYS_S9100_CONFIG_H__ */
/* @} */

View File

@@ -7,11 +7,11 @@
* @{
*
***********************************************************/
#ifndef __INGRAYSYS_S9100_PORTING_H__
#define __INGRAYSYS_S9100_PORTING_H__
#ifndef __X86_64_INGRAYSYS_S9100_PORTING_H__
#define __X86_64_INGRAYSYS_S9100_PORTING_H__
/* <auto.start.portingmacro(ALL).define> */
#if INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1
#if X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -19,88 +19,88 @@
#include <memory.h>
#endif
#ifndef INGRAYSYS_S9100_MALLOC
#ifndef X86_64_INGRAYSYS_S9100_MALLOC
#if defined(GLOBAL_MALLOC)
#define INGRAYSYS_S9100_MALLOC GLOBAL_MALLOC
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_MALLOC malloc
#define X86_64_INGRAYSYS_S9100_MALLOC GLOBAL_MALLOC
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_MALLOC malloc
#else
#error The macro INGRAYSYS_S9100_MALLOC is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_MALLOC is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_FREE
#ifndef X86_64_INGRAYSYS_S9100_FREE
#if defined(GLOBAL_FREE)
#define INGRAYSYS_S9100_FREE GLOBAL_FREE
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_FREE free
#define X86_64_INGRAYSYS_S9100_FREE GLOBAL_FREE
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_FREE free
#else
#error The macro INGRAYSYS_S9100_FREE is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_FREE is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_MEMSET
#ifndef X86_64_INGRAYSYS_S9100_MEMSET
#if defined(GLOBAL_MEMSET)
#define INGRAYSYS_S9100_MEMSET GLOBAL_MEMSET
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_MEMSET memset
#define X86_64_INGRAYSYS_S9100_MEMSET GLOBAL_MEMSET
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_MEMSET memset
#else
#error The macro INGRAYSYS_S9100_MEMSET is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_MEMSET is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_MEMCPY
#ifndef X86_64_INGRAYSYS_S9100_MEMCPY
#if defined(GLOBAL_MEMCPY)
#define INGRAYSYS_S9100_MEMCPY GLOBAL_MEMCPY
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_MEMCPY memcpy
#define X86_64_INGRAYSYS_S9100_MEMCPY GLOBAL_MEMCPY
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_MEMCPY memcpy
#else
#error The macro INGRAYSYS_S9100_MEMCPY is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_MEMCPY is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_STRNCPY
#ifndef X86_64_INGRAYSYS_S9100_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define INGRAYSYS_S9100_STRNCPY GLOBAL_STRNCPY
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_STRNCPY strncpy
#define X86_64_INGRAYSYS_S9100_STRNCPY GLOBAL_STRNCPY
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_STRNCPY strncpy
#else
#error The macro INGRAYSYS_S9100_STRNCPY is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_VSNPRINTF
#ifndef X86_64_INGRAYSYS_S9100_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define INGRAYSYS_S9100_VSNPRINTF GLOBAL_VSNPRINTF
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_VSNPRINTF vsnprintf
#define X86_64_INGRAYSYS_S9100_VSNPRINTF GLOBAL_VSNPRINTF
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_VSNPRINTF vsnprintf
#else
#error The macro INGRAYSYS_S9100_VSNPRINTF is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_VSNPRINTF is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_SNPRINTF
#ifndef X86_64_INGRAYSYS_S9100_SNPRINTF
#if defined(GLOBAL_SNPRINTF)
#define INGRAYSYS_S9100_SNPRINTF GLOBAL_SNPRINTF
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_SNPRINTF snprintf
#define X86_64_INGRAYSYS_S9100_SNPRINTF GLOBAL_SNPRINTF
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_SNPRINTF snprintf
#else
#error The macro INGRAYSYS_S9100_SNPRINTF is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_SNPRINTF is required but cannot be defined.
#endif
#endif
#ifndef INGRAYSYS_S9100_STRLEN
#ifndef X86_64_INGRAYSYS_S9100_STRLEN
#if defined(GLOBAL_STRLEN)
#define INGRAYSYS_S9100_STRLEN GLOBAL_STRLEN
#elif INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define INGRAYSYS_S9100_STRLEN strlen
#define X86_64_INGRAYSYS_S9100_STRLEN GLOBAL_STRLEN
#elif X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB == 1
#define X86_64_INGRAYSYS_S9100_STRLEN strlen
#else
#error The macro INGRAYSYS_S9100_STRLEN is required but cannot be defined.
#error The macro X86_64_INGRAYSYS_S9100_STRLEN is required but cannot be defined.
#endif
#endif
/* <auto.end.portingmacro(ALL).define> */
#endif /* __INGRAYSYS_S9100_PORTING_H__ */
#endif /* __X86_64_INGRAYSYS_S9100_PORTING_H__ */
/* @} */

View File

@@ -133,9 +133,6 @@ onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
return rc;
}
/*
* Generic LED ioctl interface.
*/
int
onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{

View File

@@ -25,50 +25,50 @@
#include <x86_64_ingrasys_s9100/x86_64_ingrasys_s9100_config.h>
/* <auto.start.cdefs(INGRAYSYS_S9100_CONFIG_HEADER).source> */
/* <auto.start.cdefs(X86_64_INGRAYSYS_S9100_CONFIG_HEADER).source> */
#define __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(_x) #_x
#define __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(_x) __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(_x)
x86_64_ingrasys_s9100_config_settings_t x86_64_ingrasys_s9100_config_settings[] =
{
#ifdef INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING) },
#else
{ INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_LOGGING(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT) },
#else
{ INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT) },
#else
{ INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT) },
#else
{ INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_PORTING_STDLIB), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_PORTING_STDLIB) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB) },
#else
{ INGRAYSYS_S9100_CONFIG_PORTING_STDLIB(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_PORTING_STDLIB(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) },
#else
{ INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI) },
#else
{ INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_INCLUDE_UCLI(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef INGRAYSYS_S9100_CONFIG_SFP_COUNT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(INGRAYSYS_S9100_CONFIG_SFP_COUNT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(INGRAYSYS_S9100_CONFIG_SFP_COUNT) },
#ifdef X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT
{ __x86_64_ingrasys_s9100_config_STRINGIFY_NAME(X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT), __x86_64_ingrasys_s9100_config_STRINGIFY_VALUE(X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT) },
#else
{ INGRAYSYS_S9100_CONFIG_SFP_COUNT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
{ X86_64_INGRAYSYS_S9100_CONFIG_SFP_COUNT(__x86_64_ingrasys_s9100_config_STRINGIFY_NAME), "__undefined__" },
#endif
{ NULL, NULL }
};
@@ -97,5 +97,5 @@ x86_64_ingrasys_s9100_config_show(struct aim_pvs_s* pvs)
return i;
}
/* <auto.end.cdefs(INGRAYSYS_S9100_CONFIG_HEADER).source> */
/* <auto.end.cdefs(X86_64_INGRAYSYS_S9100_CONFIG_HEADER).source> */

View File

@@ -30,9 +30,9 @@
* x86_64_ingrasys_s9100 log struct.
*/
AIM_LOG_STRUCT_DEFINE(
INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT,
INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT,
X86_64_INGRAYSYS_S9100_CONFIG_LOG_OPTIONS_DEFAULT,
X86_64_INGRAYSYS_S9100_CONFIG_LOG_BITS_DEFAULT,
NULL, /* Custom log map */
INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
X86_64_INGRAYSYS_S9100_CONFIG_LOG_CUSTOM_BITS_DEFAULT
);

View File

@@ -2,7 +2,7 @@ from onl.platform.base import *
from onl.platform.ingrasys import *
import os
class OnlPlatform_x86_64_ingrasys_s9100_r0(OnlPlatformingrasys):
class OnlPlatform_x86_64_ingrasys_s9100_r0(OnlPlatformIngrasys):
PLATFORM='x86-64-ingrasys-s9100-r0'
MODEL="s9100"
SYS_OBJECT_ID=".8.1"
@@ -10,8 +10,8 @@ class OnlPlatform_x86_64_ingrasys_s9100_r0(OnlPlatformingrasys):
def baseconfig(self):
self.insmod("eeprom_mb")
self.insmod("w83795")
self.insmod("eeprom")
os.system("modprobe w83795")
os.system("modprobe eeprom")
########### initialize I2C bus 1 ###########
self.new_i2c_device('pca9548', 0x70, 1)